WordPress.org
Get WordPress

Make WordPress Core

Changeset 1268 in tests for trunk/tests/term/slashes.php


Ignore:
Timestamp:
04/22/2013 06:03:08 PM (13 years ago)
Author:
ryan
Message:

Update the tests for #WP21767 to expect slashed data. Round 5.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/tests/term/slashes.php

    r1148 r1268  
    4848
    4949        $term = get_term_by( 'slug', 'string-with-1-slash', 'category' );
    50         $this->assertEquals( $this->slash_1, $term->name );
     50        $this->assertEquals( wp_unslash( $this->slash_1 ), $term->name );
    5151
    5252        $_POST = $_GET = $_REQUEST = array();
    … …  
    6666
    6767        $term = get_term_by( 'slug', 'string-with-3-slashes', 'category' );
    68         $this->assertEquals( $this->slash_3, $term->name );
     68        $this->assertEquals( wp_unslash( $this->slash_3 ), $term->name );
    6969
    7070        $_POST = $_GET = $_REQUEST = array();
    … …  
    8484
    8585        $term = get_term_by( 'slug', 'string-with-2-slashes', 'category' );
    86         $this->assertEquals( $this->slash_2, $term->name );
     86        $this->assertEquals( wp_unslash( $this->slash_2 ), $term->name );
    8787
    8888    }
    … …  
    117117
    118118            $term = get_term_by( 'slug', 'controller_slash_test_1_'.$taxonomy, $taxonomy );
    119             $this->assertEquals( $this->slash_1, $term->name );
    120             $this->assertEquals( $this->slash_3, $term->description );
     119            $this->assertEquals( wp_unslash( $this->slash_1 ), $term->name );
     120            $this->assertEquals( wp_unslash( $this->slash_3 ), $term->description );
    121121
    122122            $_POST = array(
    … …  
    137137
    138138            $term = get_term_by( 'slug', 'controller_slash_test_2_'.$taxonomy, $taxonomy );
    139             $this->assertEquals( $this->slash_3, $term->name );
    140             $this->assertEquals( $this->slash_5, $term->description );
     139            $this->assertEquals( wp_unslash( $this->slash_3 ), $term->name );
     140            $this->assertEquals( wp_unslash( $this->slash_5 ), $term->description );
    141141
    142142            $_POST = array(
    … …  
    157157
    158158            $term = get_term_by( 'slug', 'controller_slash_test_3_'.$taxonomy, $taxonomy );
    159             $this->assertEquals( $this->slash_2, $term->name );
    160             $this->assertEquals( $this->slash_4, $term->description );
    161         }
    162     }
    163 
    164     /**
    165      * Tests the model function that expects un-slashed data
     159            $this->assertEquals( wp_unslash( $this->slash_2 ), $term->name );
     160            $this->assertEquals( wp_unslash( $this->slash_4 ), $term->description );
     161        }
     162    }
     163
     164    /**
     165     * Tests the model function that expects slashed data
    166166     *
    167167     */
    … …  
    181181            );
    182182            $term = get_term( $insert['term_id'], $taxonomy );
    183             $this->assertEquals( $this->slash_1, $term->name );
    184             $this->assertEquals( $this->slash_3, $term->description );
     183            $this->assertEquals( wp_unslash( $this->slash_1 ), $term->name );
     184            $this->assertEquals( wp_unslash( $this->slash_3 ), $term->description );
    185185
    186186            $insert = wp_insert_term(
    … …  
    193193            );
    194194            $term = get_term( $insert['term_id'], $taxonomy );
    195             $this->assertEquals( $this->slash_3, $term->name );
    196             $this->assertEquals( $this->slash_5, $term->description );
     195            $this->assertEquals( wp_unslash( $this->slash_3 ), $term->name );
     196            $this->assertEquals( wp_unslash( $this->slash_5 ), $term->description );
    197197
    198198            $insert = wp_insert_term(
    … …  
    205205            );
    206206            $term = get_term( $insert['term_id'], $taxonomy );
    207             $this->assertEquals( $this->slash_2, $term->name );
    208             $this->assertEquals( $this->slash_4, $term->description );
    209         }
    210     }
    211 
    212     /**
    213      * Tests the model function that expects un-slashed data
     207            $this->assertEquals( wp_unslash( $this->slash_2 ), $term->name );
     208            $this->assertEquals( wp_unslash( $this->slash_4 ), $term->description );
     209        }
     210    }
     211
     212    /**
     213     * Tests the model function that expects slashed data
    214214     *
    215215     */
    … …  
    234234
    235235            $term = get_term( $id, $taxonomy );
    236             $this->assertEquals( $this->slash_1, $term->name );
    237             $this->assertEquals( $this->slash_3, $term->description );
     236            $this->assertEquals( wp_unslash( $this->slash_1 ), $term->name );
     237            $this->assertEquals( wp_unslash( $this->slash_3 ), $term->description );
    238238
    239239            $update = wp_update_term(
    … …  
    246246            );
    247247            $term = get_term( $id, $taxonomy );
    248             $this->assertEquals( $this->slash_3, $term->name );
    249             $this->assertEquals( $this->slash_5, $term->description );
     248            $this->assertEquals( wp_unslash( $this->slash_3 ), $term->name );
     249            $this->assertEquals( wp_unslash( $this->slash_5 ), $term->description );
    250250
    251251            $update = wp_update_term(
    … …  
    258258            );
    259259            $term = get_term( $id, $taxonomy );
    260             $this->assertEquals( $this->slash_2, $term->name );
    261             $this->assertEquals( $this->slash_4, $term->description );
     260            $this->assertEquals( wp_unslash( $this->slash_2 ), $term->name );
     261            $this->assertEquals( wp_unslash( $this->slash_4 ), $term->description );
    262262        }
    263263    }
Note: See TracChangeset for help on using the changeset viewer.