jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383286 )
Change subject: Update test mock to return license info
..
Update test mock to return license info
Broken by I759c3492d3bdaba67917db9ffe6685b9a5c32293
This adds additional stubbing.
Bug: T177801
Change-Id: I9720df2b365dca8a87d7a07a1b62528aec1042eb
---
M includes/DataProvider.php
M tests/phpunit/includes/DataProviderTest.php
2 files changed, 24 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Phuedx: Looks good to me, approved
diff --git a/includes/DataProvider.php b/includes/DataProvider.php
index 235e68f..2d438b5 100644
--- a/includes/DataProvider.php
+++ b/includes/DataProvider.php
@@ -225,7 +225,9 @@
}
} while ( $continue );
} else {
- $metadata['images'][$page['title']] = [];
+ if ( isset( $page['title'] ) ) {
+ $metadata['images'][$page['title']] = [];
+ }
}
// get sections & modules
diff --git a/tests/phpunit/includes/DataProviderTest.php
b/tests/phpunit/includes/DataProviderTest.php
index 6be5f18..91dbddc 100644
--- a/tests/phpunit/includes/DataProviderTest.php
+++ b/tests/phpunit/includes/DataProviderTest.php
@@ -101,8 +101,17 @@
$dataProvider->expects( $this->any() )
->method( 'makeActionApiRequest' )
->willReturnCallback( function ( $params ) use (
$parse, $contributors ) {
- if (
- $params['action'] === 'query' &&
$params['prop'] === 'contributors'
+ if ( isset( $params['meta'] ) &&
$params['siprop'] === 'rightsinfo' ) {
+ return [
+ 'query' => [
+ 'rightsinfo' => [
+ 'url' =>
'//creativecommons.org/licenses/by-sa/3.0/',
+ 'text' =>
'Creative Commons Attribution-Share Alike 3.0',
+ ],
+ ]
+ ];
+ } elseif (
+ $params['action'] === 'query' &&
$params['prop'] === 'contributors|images'
&& !isset( $params['meta'] ) && !isset(
$params['list'] )
) {
return [ 'query' => [ 'pages' =>
$contributors ] ];
@@ -175,6 +184,11 @@
],
],
'contributors' => [ 'X' => 1, 'Y' => 2
],
+ 'images' => [],
+ 'license' => [
+ 'url' =>
'//creativecommons.org/licenses/by-sa/3.0/',
+ 'text' => 'Creative Commons
Attribution-Share Alike 3.0',
+ ],
'modules' => [ 'foo1', 'foo2' ],
'modulescripts' => [ 'fooscript' ],
'modulestyles' => [ 'foostyle' ],
@@ -261,6 +275,11 @@
],
],
'contributors' => [ 'X' => 1, 'Y' => 2,
'Z' => 3 ],
+ 'images' => [],
+ 'license' => [
+ 'url' =>
'//creativecommons.org/licenses/by-sa/3.0/',
+ 'text' => 'Creative Commons
Attribution-Share Alike 3.0',
+ ],
'modules' => [ 'foo1', 'foo2', 'bar' ],
'modulescripts' => [ 'fooscript',
'barscript' ],
'modulestyles' => [ 'foostyle',
'barstyle' ],
--
To view, visit https://gerrit.wikimedia.org/r/383286
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9720df2b365dca8a87d7a07a1b62528aec1042eb
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: C. Scott Ananian
Gerrit-Reviewer: Phuedx
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki
