Changeset 6374

Timestamp:

03/10/2017 08:54:48 AM (9 years ago)

Author:

netweb

Message:

Build/Test Tools: Revert unintended unit test change included in commit [6373]

Antiprops netweb.
See #3085, #2963.

File:

• trunk/tests/phpunit/testcases/common/formatting.php (modified) (3 diffs)

trunk/tests/phpunit/testcases/common/formatting.php

@@ -135 +135 @@
         $this->assertEquals( $at_name_comma_final, bbp_make_clickable( $at_name_comma ) );
 
-        // Don't link non-existent users
+        // Don"t link non-existent users
         $text = "Don't link @non @existent @users";
         $this->assertSame( $text, bbp_make_clickable( $text ) );
@@ -174 +174 @@
 
         // Multiples
-        $at_name_in_mailto       = sprintf( "Send messages to @%s, @%s.", $name_1, $name_2 );
+        $at_name_in_mailto       = sprintf( "Send messages to @%s, @%s.", $link_1, $link_2 );
         $at_name_in_mailto_final = sprintf( "Send messages to @%s, @%s.", $link_1, $link_2 );
         $this->assertEquals( $at_name_in_mailto_final, bbp_make_clickable( $at_name_in_mailto ) );
-
-        // Two names separated by `&`
-        $at_names_inbetween_ampersand       = sprintf( "Oh hi @%s & @%s.", $name_1, $name_2 );
-        $at_names_inbetween_ampersand_final = sprintf( "Oh hi @%s & @%s.", $link_1, $link_2 );
-        $this->assertEquals( $at_names_inbetween_ampersand_final, bbp_make_clickable( $at_names_inbetween_ampersand ) );
-
-        // Two names separated by `and`
-        $at_names_inbetween_and       = sprintf( "Oh hi @%s and @%s.", $name_1, $name_2 );
-        $at_names_inbetween_and_final = sprintf( "Oh hi @%s and @%s.", $link_1, $link_2 );
-        $this->assertEquals( $at_names_inbetween_and_final, bbp_make_clickable( $at_names_inbetween_and ) );
 
         remove_filter( 'bbp_make_mentions_clickable_classes', '__return_empty_array' );
@@ -223 +213 @@
 
         // Multiples
-        $at_name_in_mailto       = sprintf( "Send messages to @%s, @non1, @%s, @non2.", $name_1, $name_2 );
+        $at_name_in_mailto       = sprintf( "Send messages to @%s, @non1, @%s, @non2.", $link_1, $link_2 );
         $at_name_in_mailto_final = sprintf( "Send messages to @%s, @non1, @%s, @non2.", $link_1, $link_2 );
         $this->assertEquals( $at_name_in_mailto_final, bbp_make_clickable( $at_name_in_mailto ) );