Changeset 376 in tests

Timestamp:

07/18/2011 08:25:38 PM (13 years ago)

Author:

ryan

Message:

Update meta tests

Location:

wp-testcase

Files:

• test_includes_meta.php (modified) (2 diffs)
• test_user_capabilities.php (modified) (2 diffs)

wp-testcase/test_includes_meta.php

@@ -14 +14 @@
     }
 
-    function _meta_auth_cb() {
-        return true;
-    }
-
     function _meta_sanitize_cb ( $meta_value, $meta_key, $meta_type ) {
         return 'sanitized';
@@ -29 +25 @@
         $this->assertEquals( 'unsanitized', $meta );
 
-        register_meta( 'some_meta', 'post', array( 'sanitize_callback' => array( &$this, '_meta_sanitize_cb' ) ) );
+        register_meta( 'some_meta', 'post', array( &$this, '_meta_sanitize_cb' ) );
         $meta = sanitize_meta( 'some_meta', 'unsanitized', 'post' );
         $this->assertEquals( 'sanitized', $meta );

wp-testcase/test_user_capabilities.php

@@ -30 +30 @@
     }
 
-    function _meta_yes_you_can( $key, $post_id, $user_id, $cap ) {
+    function _meta_yes_you_can( $can, $key, $post_id, $user_id, $cap, $caps ) {
         return true;
     }
 
-    function _meta_no_you_cant( $key, $post_id, $user_id, $cap ) {
+    function _meta_no_you_cant( $can, $key, $post_id, $user_id, $cap, $caps ) {
         return false;
+    }
+
+    function _meta_filter( $meta_value, $meta_key, $meta_type ) {
+        return $meta_value;
     }
 
@@ -458 +462 @@
         if ( function_exists( 'register_meta') ) {
             $this->assertTrue( $admin->has_cap('edit_post_meta',  $post) );
-            $this->assertTrue( $admin->has_cap('create_post_meta',  $post) );
+            $this->assertTrue( $admin->has_cap('add_post_meta',  $post) );
             $this->assertTrue( $admin->has_cap('delete_post_meta',  $post) );
 
             $this->assertFalse( $admin->has_cap('edit_post_meta', $post, '_protected') );
-            $this->assertFalse( $admin->has_cap('create_post_meta', $post, '_protected') );
+            $this->assertFalse( $admin->has_cap('add_post_meta', $post, '_protected') );
             $this->assertFalse( $admin->has_cap('delete_post_meta', $post, '_protected') );
 
-            register_meta( '_protected', 'post', array( 'auth_callback' => array( &$this, '_meta_yes_you_can' ) ) );
+            register_meta( '_protected', 'post', array( &$this, '_meta_filter' ), array( &$this, '_meta_yes_you_can' ) );
             $this->assertTrue( $admin->has_cap('edit_post_meta',  $post, '_protected') );
-            $this->assertTrue( $admin->has_cap('create_post_meta',  $post, '_protected') );
+            $this->assertTrue( $admin->has_cap('add_post_meta',  $post, '_protected') );
             $this->assertTrue( $admin->has_cap('delete_post_meta',  $post, '_protected') );
 
             $this->assertTrue( $admin->has_cap('edit_post_meta', $post, 'not_protected') );
-            $this->assertTrue( $admin->has_cap('create_post_meta', $post, 'not_protected') );
+            $this->assertTrue( $admin->has_cap('add_post_meta', $post, 'not_protected') );
             $this->assertTrue( $admin->has_cap('delete_post_meta', $post, 'not_protected') );
 
-            register_meta( 'not_protected', 'post', array( 'auth_callback' => array( &$this, '_meta_no_you_cant') ) );
+            register_meta( 'not_protected', 'post', array( &$this, '_meta_filter' ), array( &$this, '_meta_no_you_cant' ) );
             $this->assertFalse( $admin->has_cap('edit_post_meta',  $post, 'not_protected') );
-            $this->assertFalse( $admin->has_cap('create_post_meta',  $post, 'not_protected') );
+            $this->assertFalse( $admin->has_cap('add_post_meta',  $post, 'not_protected') );
             $this->assertFalse( $admin->has_cap('delete_post_meta',  $post, 'not_protected') );
         }