[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-10-18T10:00:01+0000 - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged.
Change subject: New Wikidata Build - 2015-10-18T10:00:01+
..
New Wikidata Build - 2015-10-18T10:00:01+
Change-Id: Id985b3c4b0ba4ce06178cfedf64c4504690e5775
---
M composer.lock
M
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
M vendor/composer/installed.json
4 files changed, 41 insertions(+), 12 deletions(-)
Approvals:
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 74e86e5..c59867e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1441,12 +1441,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "050d3dbf95d5b86c01336428adbb486ec4c5f8fe"
+"reference": "fd5c0d2fe4b729d74e8e4389c5e21be88cf15dbb"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/050d3dbf95d5b86c01336428adbb486ec4c5f8fe;,
-"reference": "050d3dbf95d5b86c01336428adbb486ec4c5f8fe",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/fd5c0d2fe4b729d74e8e4389c5e21be88cf15dbb;,
+"reference": "fd5c0d2fe4b729d74e8e4389c5e21be88cf15dbb",
"shasum": ""
},
"require": {
@@ -1515,7 +1515,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2015-10-17 23:59:12"
+"time": "2015-10-18 01:07:44"
},
{
"name": "wikibase/wikimedia-badges",
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
index 4eb0ab4..4f2fa62 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
@@ -30,6 +30,20 @@
);
}
+ protected function setUp() {
+ parent::setUp();
+
+ $settings = WikibaseClient::getDefaultInstance()->getSettings();
+ $this->oldAllowDataAccessInUserLanguage =
$settings->getSetting( 'allowDataAccessInUserLanguage' );
+ $this->setAllowDataAccessInUserLanguage( false );
+ }
+
+ protected function tearDown() {
+ parent::tearDown();
+
+ $this->setAllowDataAccessInUserLanguage(
$this->oldAllowDataAccessInUserLanguage );
+ }
+
public function testConstructor() {
$engine = Scribunto::newDefaultEngine( array() );
$luaWikibaseLibrary = new Scribunto_LuaWikibaseEntityLibrary(
$engine );
@@ -102,4 +116,12 @@
return new Scribunto_LuaWikibaseEntityLibrary( $engine );
}
+ /**
+* @param bool $value
+*/
+ private function setAllowDataAccessInUserLanguage( $value ) {
+ $settings = WikibaseClient::getDefaultInstance()->getSettings();
+ $settings->setSetting( 'allowDataAccessInUserLanguage', $value
);
+ }
+
}
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
index 9d3912f..3dd9c13 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
@@ -51,6 +51,7 @@
$settings = WikibaseClient::getDefaultInstance()->getSettings();
$this->oldAllowDataAccessInUserLanguage =
$settings->getSetting( 'allowDataAccessInUserLanguage' );
+ $this->setAllowDataAccessInUserLanguage( false );
}
protected function tearDown() {
@@ -254,11 +255,17 @@
$entityArr = $luaWikibaseLibrary->getEntity( 'Q32487' );
$snaks = $entityArr[0]['claims']['P342'][1]['qualifiers'];
- $this->assertSame(
- array( 'A qualifier Snak, Moar qualifiers' ),
- $luaWikibaseLibrary->renderSnaks( $snaks )
- );
+ $expected = array( 'A qualifier Snak, Moar qualifiers' );
+ if (
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-10-18T10:00:01+0000 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247083
Change subject: New Wikidata Build - 2015-10-18T10:00:01+
..
New Wikidata Build - 2015-10-18T10:00:01+
Change-Id: Id985b3c4b0ba4ce06178cfedf64c4504690e5775
---
M composer.lock
M
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
M vendor/composer/installed.json
4 files changed, 41 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/83/247083/1
diff --git a/composer.lock b/composer.lock
index 74e86e5..c59867e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1441,12 +1441,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "050d3dbf95d5b86c01336428adbb486ec4c5f8fe"
+"reference": "fd5c0d2fe4b729d74e8e4389c5e21be88cf15dbb"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/050d3dbf95d5b86c01336428adbb486ec4c5f8fe;,
-"reference": "050d3dbf95d5b86c01336428adbb486ec4c5f8fe",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/fd5c0d2fe4b729d74e8e4389c5e21be88cf15dbb;,
+"reference": "fd5c0d2fe4b729d74e8e4389c5e21be88cf15dbb",
"shasum": ""
},
"require": {
@@ -1515,7 +1515,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2015-10-17 23:59:12"
+"time": "2015-10-18 01:07:44"
},
{
"name": "wikibase/wikimedia-badges",
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
index 4eb0ab4..4f2fa62 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
@@ -30,6 +30,20 @@
);
}
+ protected function setUp() {
+ parent::setUp();
+
+ $settings = WikibaseClient::getDefaultInstance()->getSettings();
+ $this->oldAllowDataAccessInUserLanguage =
$settings->getSetting( 'allowDataAccessInUserLanguage' );
+ $this->setAllowDataAccessInUserLanguage( false );
+ }
+
+ protected function tearDown() {
+ parent::tearDown();
+
+ $this->setAllowDataAccessInUserLanguage(
$this->oldAllowDataAccessInUserLanguage );
+ }
+
public function testConstructor() {
$engine = Scribunto::newDefaultEngine( array() );
$luaWikibaseLibrary = new Scribunto_LuaWikibaseEntityLibrary(
$engine );
@@ -102,4 +116,12 @@
return new Scribunto_LuaWikibaseEntityLibrary( $engine );
}
+ /**
+* @param bool $value
+*/
+ private function setAllowDataAccessInUserLanguage( $value ) {
+ $settings = WikibaseClient::getDefaultInstance()->getSettings();
+ $settings->setSetting( 'allowDataAccessInUserLanguage', $value
);
+ }
+
}
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
index 9d3912f..3dd9c13 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
@@ -51,6 +51,7 @@
$settings = WikibaseClient::getDefaultInstance()->getSettings();
$this->oldAllowDataAccessInUserLanguage =
$settings->getSetting( 'allowDataAccessInUserLanguage' );
+ $this->setAllowDataAccessInUserLanguage( false );
}
protected function tearDown() {
@@ -254,11 +255,17 @@
$entityArr = $luaWikibaseLibrary->getEntity( 'Q32487' );
$snaks = $entityArr[0]['claims']['P342'][1]['qualifiers'];
- $this->assertSame(
- array( 'A qualifier Snak, Moar qualifiers' ),
- $luaWikibaseLibrary->renderSnaks( $snaks )
- );
+ $expected = array( 'A qualifier
