Changeset 1215 in tests

Timestamp:

02/14/2013 10:51:37 PM (13 years ago)

Author:

ryan

Message:

Update for [WP23416]

Location:

trunk

Files:

• includes/factory.php (modified) (1 diff)
• tests/admin/includesMisc.php (modified) (1 diff)
• tests/meta.php (modified) (2 diffs)
• tests/post/meta.php (modified) (1 diff)
• tests/post/slashes.php (modified) (2 diffs)

trunk/includes/factory.php

@@ -78 +78 @@
 
     function create_object( $args ) {
-        return wp_insert_comment( $this->addslashes_deep( $args ) );
+        return wp_insert_comment( $args );
     }
 
     function update_object( $comment_id, $fields ) {
         $fields['comment_ID'] = $comment_id;
-        return wp_update_comment( $this->addslashes_deep( $fields ) );
+        return wp_update_comment( $fields );
     }
 

trunk/tests/admin/includesMisc.php

@@ -7 +7 @@
     function test_shorten_url() {
         $tests = array(
-            // strip slashes
-            'wordpress\.org/about/philosophy'
-                => 'wordpress.org/about/philosophy', // strip slashes
+            'wordpress.org/about/philosophy'
+                => 'wordpress.org/about/philosophy',
             'http://wordpress.org/about/philosophy/'
                 => 'wordpress.org/about/philosophy', // remove http, trailing slash

trunk/tests/meta.php

@@ -125 +125 @@
         $key = rand_str();
         $value = 'Test\\singleslash';
-        $expected = 'Testsingleslash';
+        $expected = 'Test\\singleslash';
         $value2 = 'Test\\\\doubleslash';
-        $expected2 = 'Test\\doubleslash';
+        $expected2 = 'Test\\\\doubleslash';
+        $value3 = 'Test\oneslash';
+        $expected3 = 'Test\oneslash';
         $this->assertFalse( metadata_exists( 'user', $this->author->ID, $key ) );
         $this->assertFalse( delete_metadata( 'user', $this->author->ID, $key ) );
@@ -150 +152 @@
         $this->assertInternalType( 'int', update_metadata( 'user', $this->author->ID, $key, $value2 ) );
         $this->assertEquals( $expected2, get_metadata( 'user', $this->author->ID, $key, true ) );
+        $this->assertTrue( delete_metadata( 'user', $this->author->ID, $key ) );
+        $this->assertSame( '', get_metadata( 'user', $this->author->ID, $key, true ) );
+        $this->assertFalse( metadata_exists( 'user', $this->author->ID, $key ) );
+
+        $this->assertInternalType( 'int', add_metadata( 'user', $this->author->ID, $key, $value3 ) );
+        $this->assertEquals( $expected3, get_metadata( 'user', $this->author->ID, $key, true ) );
+        $this->assertTrue( delete_metadata( 'user', $this->author->ID, $key ) );
+        $this->assertSame( '', get_metadata( 'user', $this->author->ID, $key, true ) );
+        $this->assertInternalType( 'int', update_metadata( 'user', $this->author->ID, $key, $value3 ) );
+        $this->assertEquals( $expected3, get_metadata( 'user', $this->author->ID, $key, true ) );
     }
 }

trunk/tests/post/meta.php

@@ -220 +220 @@
         $this->assertTrue( update_meta( $mid1, 'unique_update', addslashes( $data ) ) );
         $meta = get_metadata_by_mid( 'post', $mid1 );
-        $this->assertEquals( $data, $meta->meta_value );
+        $this->assertEquals( addslashes( $data ), $meta->meta_value );
     }
 

trunk/tests/post/slashes.php

@@ -41 +41 @@
         $_POST['content'] = $this->slash_5;
         $_POST['excerpt'] = $this->slash_7;
-        $_POST = add_magic_quotes( $_POST ); // the edit_post() function will strip slashes
+        $_POST = wp_slash( $_POST ); // the edit_post() function will strip slashes
 
         $post_id = edit_post();
@@ -55 +55 @@
         $_POST['content'] = $this->slash_4;
         $_POST['excerpt'] = $this->slash_6;
-        $_POST = add_magic_quotes( $_POST );
+        $_POST = wp_slash( $_POST );
 
         $post_id = edit_post();