From: Mark Holmquist <mtraceur@member.fsf.org>
Date: Mon, 25 Feb 2013 23:37:43 +0000 (-0800)
Subject: (bug 45396) Use IETF example domains, not Britney
X-Git-Tag: 1.31.0-rc.0~20576
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=db6214985ab9e27c69c0b9b6d44e980f2a1462ca;p=lhc%2Fweb%2Fwiklou.git

(bug 45396) Use IETF example domains, not Britney

I don't know why Britney-Spears was in core parser tests as the example domain
name, but....well, suffice it to say she's not any more. We're using
example.org now, like sane people.

Change-Id: I47b53b94b4d7e8ad4a992de5e112685df48156c2
---

diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index aa56e6e3f1..13217e21ff 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -631,7 +631,7 @@ class ParserTest {
 			self::getOptionValue( 'wgLinkHolderBatchSize', $opts, 1000 );
 
 		$settings = array(
-			'wgServer' => 'http://Britney-Spears',
+			'wgServer' => 'http://example.org',
 			'wgScript' => '/index.php',
 			'wgScriptPath' => '/',
 			'wgArticlePath' => '/wiki/$1',
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index d63fb3b18c..ede4ae92f3 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -4626,7 +4626,7 @@ Magic Word: {{SERVER}}
 !! input
 {{SERVER}}
 !! result
-<p><a rel="nofollow" class="external free" href="http://Britney-Spears">http://Britney-Spears</a>
+<p><a rel="nofollow" class="external free" href="http://example.org">http://example.org</a>
 </p>
 !! end
 
@@ -4635,7 +4635,7 @@ Magic Word: {{SERVERNAME}}
 !! input
 {{SERVERNAME}}
 !! result
-<p>Britney-Spears
+<p>example.org
 </p>
 !! end
 
@@ -8771,9 +8771,9 @@ Sanitizer: Validating that <meta> and <link> work, but only for Microdata
 	&lt;meta http-equiv="refresh" content="5"&gt;
 	<meta itemprop="hello" content="5" />
 </p>
-	<link itemprop="hello" href="http&#58;//Britney-Spears" />
-	&lt;link rel="stylesheet" href="<a rel="nofollow" class="external free" href="http://Britney-Spears">http://Britney-Spears</a>"&gt;
-	<link itemprop="hello" href="http&#58;//Britney-Spears" />
+	<link itemprop="hello" href="http&#58;//example.org" />
+	&lt;link rel="stylesheet" href="<a rel="nofollow" class="external free" href="http://example.org">http://example.org</a>"&gt;
+	<link itemprop="hello" href="http&#58;//example.org" />
 </div>
 
 !! end
diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php
index ec9ee1ab31..f8d0c37f53 100644
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -275,7 +275,7 @@ class NewParserTest extends MediaWikiTestCase {
 		}
 
 		$settings = array(
-			'wgServer' => 'http://Britney-Spears',
+			'wgServer' => 'http://example.org',
 			'wgScript' => '/index.php',
 			'wgScriptPath' => '/',
 			'wgArticlePath' => '/wiki/$1',