Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/208331
Change subject: tests: Don't use getDefinitionSummary() as an API ...................................................................... tests: Don't use getDefinitionSummary() as an API Follows-up cc3ca32. Especially with regards to Ibb292d241 in MediaWiki core which will break this. Invoke getPages() instead, which is the intended unit test target. Change-Id: I135a2ff05e429b76c38c68eaf6e48c24fbb06445 --- M tests/ResourceLoaderGlobalSiteModuleTest.php M tests/ResourceLoaderGlobalUserModuleTest.php 2 files changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalCssJs refs/changes/31/208331/1 diff --git a/tests/ResourceLoaderGlobalSiteModuleTest.php b/tests/ResourceLoaderGlobalSiteModuleTest.php index 87604ab..7d33990 100644 --- a/tests/ResourceLoaderGlobalSiteModuleTest.php +++ b/tests/ResourceLoaderGlobalSiteModuleTest.php @@ -71,8 +71,10 @@ ) ); $module = new ResourceLoaderGlobalSiteModule( $this->getFakeOptions() ); $context = $this->getContext( array( 'skin' => $skin ) ); - $out = $module->getDefinitionSummary( $context ); - $pages = array_keys( $out['pages'] ); + $getPages = new ReflectionMethod( 'ResourceLoaderGlobalSiteModule', 'getPages' ); + $getPages->setAccessible( true ); + $out = $getPages->invoke( $module, $context ); + $pages = array_keys( $out ); $this->assertEquals( $expectedPages, $pages, $desc ); } } diff --git a/tests/ResourceLoaderGlobalUserModuleTest.php b/tests/ResourceLoaderGlobalUserModuleTest.php index ed585a4..f6d0a08 100644 --- a/tests/ResourceLoaderGlobalUserModuleTest.php +++ b/tests/ResourceLoaderGlobalUserModuleTest.php @@ -93,8 +93,10 @@ ) ); $module = new ResourceLoaderGlobalUserModule( $this->getFakeOptions() ); $context = $this->getContext( array( 'user' => $user ) ); - $out = $module->getDefinitionSummary( $context ); - $pages = array_keys( $out['pages'] ); + $getPages = new ReflectionMethod( 'ResourceLoaderGlobalUserModule', 'getPages' ); + $getPages->setAccessible( true ); + $out = $getPages->invoke( $module, $context ); + $pages = array_keys( $out ); $this->assertEquals( $expectedPages, $pages, $desc ); } } -- To view, visit https://gerrit.wikimedia.org/r/208331 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I135a2ff05e429b76c38c68eaf6e48c24fbb06445 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalCssJs Gerrit-Branch: master Gerrit-Owner: Krinkle <krinklem...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits