mirror of
git://develop.git.wordpress.org/
synced 2025-05-15 00:05:26 +02:00
Tests: Clean up convert_smilies()
tests.
Includes: * Removing redundant `use_smilies` option switches, as it is set to 1 by default. * Restoring the `$wpsmiliestrans` array before performing assertions, not after. * Moving most of the `smilies_init()` calls to a `set_up()` method. Follow-up to [409/tests], [26191], [28717]. See #62278. git-svn-id: https://develop.svn.wordpress.org/trunk@59516 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
c3c319ed58
commit
cdc2f255ac
@ -8,6 +8,12 @@
|
||||
*/
|
||||
class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
|
||||
|
||||
public function set_up() {
|
||||
parent::set_up();
|
||||
|
||||
smilies_init();
|
||||
}
|
||||
|
||||
/**
|
||||
* Basic validation test to confirm that smilies are converted to image
|
||||
* when use_smilies = 1 and not when use_smilies = 0.
|
||||
@ -15,14 +21,9 @@ class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
|
||||
* @dataProvider data_convert_standard_smilies
|
||||
*/
|
||||
public function test_convert_standard_smilies( $input, $converted ) {
|
||||
// Standard smilies, use_smilies: ON.
|
||||
update_option( 'use_smilies', 1 );
|
||||
|
||||
smilies_init();
|
||||
|
||||
$this->assertSame( $converted, convert_smilies( $input ) );
|
||||
|
||||
// Standard smilies, use_smilies: OFF.
|
||||
// Disable smilies.
|
||||
update_option( 'use_smilies', 0 );
|
||||
|
||||
$this->assertSame( $input, convert_smilies( $input ) );
|
||||
@ -77,13 +78,6 @@ class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
|
||||
public function test_convert_custom_smilies( $input, $converted ) {
|
||||
global $wpsmiliestrans;
|
||||
|
||||
// Custom smilies, use_smilies: ON.
|
||||
update_option( 'use_smilies', 1 );
|
||||
|
||||
if ( ! isset( $wpsmiliestrans ) ) {
|
||||
smilies_init();
|
||||
}
|
||||
|
||||
$trans_orig = $wpsmiliestrans; // Save original translations array.
|
||||
|
||||
$wpsmiliestrans = array(
|
||||
@ -97,12 +91,12 @@ class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
|
||||
|
||||
$this->assertSame( $converted, convert_smilies( $input ) );
|
||||
|
||||
// Standard smilies, use_smilies: OFF.
|
||||
// Disable smilies.
|
||||
update_option( 'use_smilies', 0 );
|
||||
|
||||
$this->assertSame( $input, convert_smilies( $input ) );
|
||||
|
||||
$wpsmiliestrans = $trans_orig; // Reset original translations array.
|
||||
|
||||
$this->assertSame( $input, convert_smilies( $input ) );
|
||||
}
|
||||
|
||||
/**
|
||||
@ -147,14 +141,7 @@ class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
|
||||
$input = 'Do we ignore smilies ;-) in ' . $element . ' tags <' . $element . ' class="foo">My Content Here :?: </' . $element . '>';
|
||||
$expected = "Do we ignore smilies \xf0\x9f\x98\x89 in $element tags <$element class=\"foo\">My Content Here :?: </$element>";
|
||||
|
||||
// Standard smilies, use_smilies: ON.
|
||||
update_option( 'use_smilies', 1 );
|
||||
smilies_init();
|
||||
|
||||
$this->assertSame( $expected, convert_smilies( $input ) );
|
||||
|
||||
// Standard smilies, use_smilies: OFF.
|
||||
update_option( 'use_smilies', 0 );
|
||||
}
|
||||
|
||||
/**
|
||||
@ -184,13 +171,9 @@ class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
|
||||
* @dataProvider data_smilies_combinations
|
||||
*/
|
||||
public function test_smilies_combinations( $input, $converted ) {
|
||||
// Custom smilies, use_smilies: ON.
|
||||
update_option( 'use_smilies', 1 );
|
||||
smilies_init();
|
||||
|
||||
$this->assertSame( $converted, convert_smilies( $input ) );
|
||||
|
||||
// Custom smilies, use_smilies: OFF.
|
||||
// Disable smilies.
|
||||
update_option( 'use_smilies', 0 );
|
||||
|
||||
$this->assertSame( $input, convert_smilies( $input ) );
|
||||
@ -247,13 +230,6 @@ class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
|
||||
public function test_single_smilies_in_wpsmiliestrans( $input, $converted ) {
|
||||
global $wpsmiliestrans;
|
||||
|
||||
// Standard smilies, use_smilies: ON.
|
||||
update_option( 'use_smilies', 1 );
|
||||
|
||||
if ( ! isset( $wpsmiliestrans ) ) {
|
||||
smilies_init();
|
||||
}
|
||||
|
||||
$orig_trans = $wpsmiliestrans; // Save original translations array.
|
||||
|
||||
$wpsmiliestrans = array(
|
||||
@ -264,12 +240,12 @@ class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
|
||||
|
||||
$this->assertSame( $converted, convert_smilies( $input ) );
|
||||
|
||||
// Standard smilies, use_smilies: OFF.
|
||||
// Disable smilies.
|
||||
update_option( 'use_smilies', 0 );
|
||||
|
||||
$this->assertSame( $input, convert_smilies( $input ) );
|
||||
|
||||
$wpsmiliestrans = $orig_trans; // Reset original translations array.
|
||||
|
||||
$this->assertSame( $input, convert_smilies( $input ) );
|
||||
}
|
||||
|
||||
/**
|
||||
@ -312,15 +288,7 @@ class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
|
||||
* @dataProvider data_spaces_around_smilies
|
||||
*/
|
||||
public function test_spaces_around_smilies( $input, $converted ) {
|
||||
// Standard smilies, use_smilies: ON.
|
||||
update_option( 'use_smilies', 1 );
|
||||
|
||||
smilies_init();
|
||||
|
||||
$this->assertSame( $converted, convert_smilies( $input ) );
|
||||
|
||||
// Standard smilies, use_smilies: OFF.
|
||||
update_option( 'use_smilies', 0 );
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user