Changeset 34519

Timestamp:

09/24/2015 09:01:10 PM (9 years ago)

Author:

johnbillion

Message:

Use WP_TESTS_DOMAIN where it should be used in tests in place of hard-coded uses of example.org.

Also corrects a test value in the data provider for Tests_Sanitize_Option::test_sanitize_option() which was only consequentially passing.

Fixes #34000

Location:

trunk/tests/phpunit/tests

Files:

• option/sanitize-option.php (modified) (1 diff)
• term/getEditTermLink.php (modified) (1 diff)
• term/wpGenerateTagCloud.php (modified) (5 diffs)

trunk/tests/phpunit/tests/option/sanitize-option.php

@@ -41 +41 @@
             array( 'siteurl', 'http://example.org/subdir', 'http://example.org/subdir' ),
             array( 'siteurl', get_option( 'siteurl' ), '' ),
-            array( 'home', 'http://example.org', 'example.org' ),
+            array( 'home', 'http://example.org', 'http://example.org' ),
             array( 'home', 'https://example.org', 'https://example.org' ),
             array( 'home', 'http://localhost:8000', 'http://localhost:8000' ),

trunk/tests/phpunit/tests/term/getEditTermLink.php

@@ -18 +18 @@
 
         $actual = get_edit_term_link( $term1, 'wptests_tax' );
-        $expected = 'http://example.org/wp-admin/edit-tags.php?action=edit&taxonomy=wptests_tax&tag_ID=' . $term1 . '&post_type=post';
+        $expected = 'http://' . WP_TESTS_DOMAIN . '/wp-admin/edit-tags.php?action=edit&taxonomy=wptests_tax&tag_ID=' . $term1 . '&post_type=post';
         $this->assertEquals( $expected, $actual );
     }

trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php

@@ -94 +94 @@
                     'hide_empty' => false,
                 ),
-                "<a href='http://example.org/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a>",
+                "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a>",
                 array(
                     'hide_empty' => false,
@@ -108 +108 @@
                 ),
                 array(
-                    "<a href='http://example.org/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a>",
+                    "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a>",
                 ),
                 array(
@@ -123 +123 @@
                     'hide_empty' => false,
                 ),
-                "<ul class='wp-tag-cloud'>\n\t<li><a href='http://example.org/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a></li>\n</ul>\n",
+                "<ul class='wp-tag-cloud'>\n\t<li><a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a></li>\n</ul>\n",
                 array(
                     'hide_empty' => false,
@@ -136 +136 @@
                     'hide_empty' => false,
                 ),
-                "<a href='http://example.org/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a>\n".
-                "<a href='http://example.org/?tag=term-2' class='tag-link-1' title='0 topics' style='font-size: 8pt;'>Term 2</a>\n".
-                "<a href='http://example.org/?tag=term-3' class='tag-link-2' title='0 topics' style='font-size: 8pt;'>Term 3</a>\n".
-                "<a href='http://example.org/?tag=term-4' class='tag-link-3' title='0 topics' style='font-size: 8pt;'>Term 4</a>",
+                "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a>\n".
+                "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-2' class='tag-link-1' title='0 topics' style='font-size: 8pt;'>Term 2</a>\n".
+                "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-3' class='tag-link-2' title='0 topics' style='font-size: 8pt;'>Term 3</a>\n".
+                "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-4' class='tag-link-3' title='0 topics' style='font-size: 8pt;'>Term 4</a>",
                 array(
                     'hide_empty' => false,
@@ -152 +152 @@
                 ),
                 "<ul class='wp-tag-cloud'>\n\t<li>".
-                "<a href='http://example.org/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a></li>\n\t<li>".
-                "<a href='http://example.org/?tag=term-2' class='tag-link-1' title='0 topics' style='font-size: 8pt;'>Term 2</a></li>\n\t<li>".
-                "<a href='http://example.org/?tag=term-3' class='tag-link-2' title='0 topics' style='font-size: 8pt;'>Term 3</a></li>\n\t<li>".
-                "<a href='http://example.org/?tag=term-4' class='tag-link-3' title='0 topics' style='font-size: 8pt;'>Term 4</a>".
+                "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a></li>\n\t<li>".
+                "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-2' class='tag-link-1' title='0 topics' style='font-size: 8pt;'>Term 2</a></li>\n\t<li>".
+                "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-3' class='tag-link-2' title='0 topics' style='font-size: 8pt;'>Term 3</a></li>\n\t<li>".
+                "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-4' class='tag-link-3' title='0 topics' style='font-size: 8pt;'>Term 4</a>".
                 "</li>\n</ul>\n",
                 array(