(bug 45396) Use IETF example domains, not Britney
authorMark Holmquist <mtraceur@member.fsf.org>
Mon, 25 Feb 2013 23:37:43 +0000 (15:37 -0800)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 26 Feb 2013 00:25:38 +0000 (00:25 +0000)
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

tests/parser/parserTest.inc
tests/parser/parserTests.txt
tests/phpunit/includes/parser/NewParserTest.php

index aa56e6e..13217e2 100644 (file)
@@ -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',
index d63fb3b..ede4ae9 100644 (file)
@@ -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
index ec9ee1a..f8d0c37 100644 (file)
@@ -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',