From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 24 Apr 2018 17:30:24 +0000 (+0100)
Subject: SiteConfiguration: Add test to confirm null as valid override
X-Git-Tag: 1.34.0-rc.0~5621^2
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=816b6ea01dcbbebf0fb5894510b2207d6d5f1755;p=lhc%2Fweb%2Fwiklou.git

SiteConfiguration: Add test to confirm null as valid override

E.g. not being misinterpreted as unset or something like that.

Change-Id: I253f17a828ae47886d1c4f2ca5097a546c38d119
---

diff --git a/tests/phpunit/includes/SiteConfigurationTest.php b/tests/phpunit/includes/SiteConfigurationTest.php
index 164c32477a..3b7226245f 100644
--- a/tests/phpunit/includes/SiteConfigurationTest.php
+++ b/tests/phpunit/includes/SiteConfigurationTest.php
@@ -27,6 +27,8 @@ class SiteConfigurationTest extends MediaWikiTestCase {
 				'default' => 'default',
 				'wiki' => 'wiki',
 				'tag' => 'tag',
+				'frwiki' => 'frwiki',
+				'null_wiki' => null,
 			],
 
 			'WithParams' => [
@@ -183,6 +185,17 @@ class SiteConfigurationTest extends MediaWikiTestCase {
 			$this->mConf->get( 'Fallback', 'dewiki', 'wiki', [], [ 'tag' ] ),
 			'get(): fallback setting on an existing wiki (with wiki tag)'
 		);
+		$this->assertEquals(
+			'frwiki',
+			$this->mConf->get( 'Fallback', 'frwiki', 'wiki', [], [ 'tag' ] ),
+			'get(): no fallback if wiki has its own setting (matching tag)'
+		);
+		$this->assertSame(
+			// Potential regression test for T192855
+			null,
+			$this->mConf->get( 'Fallback', 'null_wiki', 'wiki', [], [ 'tag' ] ),
+			'get(): no fallback if wiki has its own setting (matching tag and uses null)'
+		);
 		$this->assertEquals(
 			'wiki',
 			$this->mConf->get( 'Fallback', 'wiki', 'wiki' ),