Changeset 27718

Timestamp:

03/25/2014 05:39:08 PM (11 years ago)

Author:

nacin

Message:

Ensure the $path is trailing-slashed in domain_exists().

Adds tests for [27717].

props ejdanderson, ericmann.
fixes #20589.

File:

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

trunk/tests/phpunit/tests/ms.php

@@ -977 +977 @@
 
     function _domain_exists_cb( $exists, $domain, $path, $site_id ) {
-        if ( 'foo' == $domain && 'bar' == $path )
+        if ( 'foo' == $domain && 'bar/' == $path )
             return 1234;
         else
@@ -998 +998 @@
         $this->assertEquals( null, domain_exists( 'foo', 'baz' ) );
         $this->assertEquals( null, domain_exists( 'bar', 'foo' ) );
+
+        // Make sure the same result is returned with or without a trailing slash
+        $this->assertEquals( domain_exists( 'foo', 'bar' ), domain_exists( 'foo', 'bar/' ) );
 
         remove_filter( 'domain_exists', array( $this, '_domain_exists_cb' ), 10, 4 );