Changeset 28280 for trunk/tests/phpunit/tests/ms.php

Timestamp:

05/06/2014 05:31:12 AM (11 years ago)

Author:

nacin

Message:

Multisite: Treat 'www' as a special subdomain, reversing 3.9 regression.

props jeremyfelt.
fixes #27927.

File:

• trunk/tests/phpunit/tests/ms.php (modified) (3 diffs)

trunk/tests/phpunit/tests/ms.php

@@ -1226 +1226 @@
     /**
      * @ticket 27003
+     * @ticket 27927
      */
     function test_get_site_by_path() {
@@ -1234 +1235 @@
             'make.wordpress.org/'         => array( 'domain' => 'make.wordpress.org', 'path' => '/' ),
             'make.wordpress.org/foo/'     => array( 'domain' => 'make.wordpress.org', 'path' => '/foo/' ),
+            'www.w.org/'                  => array( 'domain' => 'www.w.org',          'path' => '/' ),
+            'www.w.org/foo/'              => array( 'domain' => 'www.w.org',          'path' => '/foo/' ),
+            'www.w.org/foo/bar/'          => array( 'domain' => 'www.w.org',          'path' => '/foo/bar/' ),
         );
 
@@ -1244 +1248 @@
             get_site_by_path( 'wordpress.org', '/notapath/' )->blog_id );
 
+        $this->assertEquals( $ids['wordpress.org/'],
+            get_site_by_path( 'www.wordpress.org', '/notapath/' )->blog_id );
+
         $this->assertEquals( $ids['wordpress.org/foo/bar/'],
             get_site_by_path( 'wordpress.org', '/foo/bar/baz/' )->blog_id );
 
         $this->assertEquals( $ids['wordpress.org/foo/bar/'],
+            get_site_by_path( 'www.wordpress.org', '/foo/bar/baz/' )->blog_id );
+
+        $this->assertEquals( $ids['wordpress.org/foo/bar/'],
             get_site_by_path( 'wordpress.org', '/foo/bar/baz/', 3 )->blog_id );
+
+        $this->assertEquals( $ids['wordpress.org/foo/bar/'],
+            get_site_by_path( 'www.wordpress.org', '/foo/bar/baz/', 3 )->blog_id );
 
         $this->assertEquals( $ids['wordpress.org/foo/bar/'],
             get_site_by_path( 'wordpress.org', '/foo/bar/baz/', 2 )->blog_id );
 
+        $this->assertEquals( $ids['wordpress.org/foo/bar/'],
+            get_site_by_path( 'www.wordpress.org', '/foo/bar/baz/', 2 )->blog_id );
+
         $this->assertEquals( $ids['wordpress.org/foo/'],
             get_site_by_path( 'wordpress.org', '/foo/bar/baz/', 1 )->blog_id );
 
+        $this->assertEquals( $ids['wordpress.org/foo/'],
+            get_site_by_path( 'www.wordpress.org', '/foo/bar/baz/', 1 )->blog_id );
+
         $this->assertEquals( $ids['wordpress.org/'],
             get_site_by_path( 'wordpress.org', '/', 0 )->blog_id );
 
+        $this->assertEquals( $ids['wordpress.org/'],
+            get_site_by_path( 'www.wordpress.org', '/', 0 )->blog_id );
+
         $this->assertEquals( $ids['make.wordpress.org/foo/'],
             get_site_by_path( 'make.wordpress.org', '/foo/bar/baz/qux/', 4 )->blog_id );
+
+        $this->assertEquals( $ids['make.wordpress.org/foo/'],
+            get_site_by_path( 'www.make.wordpress.org', '/foo/bar/baz/qux/', 4 )->blog_id );
+
+        $this->assertEquals( $ids['www.w.org/'],
+            get_site_by_path( 'www.w.org', '/', 0 )->blog_id );
+
+        $this->assertEquals( $ids['www.w.org/'],
+            get_site_by_path( 'www.w.org', '/notapath/' )->blog_id );
+
+        $this->assertEquals( $ids['www.w.org/foo/bar/'],
+            get_site_by_path( 'www.w.org', '/foo/bar/baz/' )->blog_id );
+
+        $this->assertEquals( $ids['www.w.org/foo/'],
+            get_site_by_path( 'www.w.org', '/foo/bar/baz/', 1 )->blog_id );
+
+        // A site installed with www will not be found by the root domain.
+        $this->assertFalse( get_site_by_path( 'w.org', '/' ) );
+        $this->assertFalse( get_site_by_path( 'w.org', '/notapath/' ) );
+        $this->assertFalse( get_site_by_path( 'w.org', '/foo/bar/baz/' ) );
+        $this->assertFalse( get_site_by_path( 'w.org', '/foo/bar/baz/', 1 ) );
+
+        // A site will not be found by its root domain when an invalid subdomain is requested.
+        $this->assertFalse( get_site_by_path( 'invalid.wordpress.org', '/' ) );
+        $this->assertFalse( get_site_by_path( 'invalid.wordpress.org', '/foo/bar/' ) );
     }