From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- .../tests/phpunit/finder/FinderTest.php | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'extensions/LocalisationUpdate/tests/phpunit/finder/FinderTest.php') diff --git a/extensions/LocalisationUpdate/tests/phpunit/finder/FinderTest.php b/extensions/LocalisationUpdate/tests/phpunit/finder/FinderTest.php index 8cc0f7d7..b8213bac 100644 --- a/extensions/LocalisationUpdate/tests/phpunit/finder/FinderTest.php +++ b/extensions/LocalisationUpdate/tests/phpunit/finder/FinderTest.php @@ -18,6 +18,7 @@ class LU_FinderTest extends MediaWikiTestCase { 'core' => '/IP/extensions/Door/i18n/core', 'extra' => '/IP/extensions/Door/i18n/extra', ), + 'Vector' => '/IP/skins/Vector/i18n', ), '/IP' ); @@ -26,10 +27,11 @@ class LU_FinderTest extends MediaWikiTestCase { $expected = array( 'repo' => 'mediawiki', 'orig' => "file:///IP/languages/messages/Messages*.php", - 'path' => 'languages/messages/Messages*.php', + 'path' => 'languages/messages/i18n/*.json', ); + $this->assertArrayHasKey( 'core', $observed ); - $this->assertSame( $expected, $observed['core'], 'Core php file' ); + $this->assertEquals( $expected, $observed['core'], 'Core php file' ); $expected = array( 'repo' => 'extension', @@ -38,7 +40,7 @@ class LU_FinderTest extends MediaWikiTestCase { 'path' => 'TranslateSearch.i18n.php' ); $this->assertArrayHasKey( 'TranslateSearch', $observed ); - $this->assertSame( $expected, $observed['TranslateSearch'], 'PHP only extension' ); + $this->assertEquals( $expected, $observed['TranslateSearch'], 'PHP only extension' ); $expected = array( 'repo' => 'extension', @@ -47,7 +49,7 @@ class LU_FinderTest extends MediaWikiTestCase { 'path' => 'i18n/*.json' ); $this->assertArrayHasKey( 'Babel-0', $observed ); - $this->assertSame( $expected, $observed['Babel-0'], 'PHP&JSON extension' ); + $this->assertEquals( $expected, $observed['Babel-0'], 'PHP&JSON extension' ); $expected = array( 'repo' => 'extension', @@ -56,7 +58,7 @@ class LU_FinderTest extends MediaWikiTestCase { 'path' => 'i18n/core/*.json' ); $this->assertArrayHasKey( 'Door-core', $observed ); - $this->assertSame( $expected, $observed['Door-core'], 'Multidir json extension' ); + $this->assertEquals( $expected, $observed['Door-core'], 'Multidir json extension' ); $expected = array( 'repo' => 'extension', @@ -65,6 +67,15 @@ class LU_FinderTest extends MediaWikiTestCase { 'path' => 'i18n/extra/*.json' ); $this->assertArrayHasKey( 'Door-extra', $observed ); - $this->assertSame( $expected, $observed['Door-extra'], 'Multidir json extension' ); + $this->assertEquals( $expected, $observed['Door-extra'], 'Multidir json extension' ); + + $expected = array( + 'repo' => 'skin', + 'name' => 'Vector', + 'orig' => 'file:///IP/skins/Vector/i18n/*.json', + 'path' => 'i18n/*.json' + ); + $this->assertArrayHasKey( 'Vector-0', $observed ); + $this->assertEquals( $expected, $observed['Vector-0'], 'Json skin' ); } } -- cgit v1.2.2