Changeset 10377 for trunk/tests/phpunit/testcases/core/caps.php

Timestamp:

11/25/2015 07:32:22 PM (9 years ago)

Author:

r-a-y

Message:

Caps: Fix issue with passing an empty array as an argument in bp_current_user_can().

Changes to bp_current_user_can() in #6501 broke older capability checks
relying on an empty argument to be passed in order to use a fallback value.

Most notably, bp_current_user_can('bp_xprofile_change_field_visibility' )
checks now passed by default. This resulted in the "Change" link to
always be visible when editing a profile field even if an admin has enabled
"Enforce field visibility" for that particular field.

This commit fixes this issue by passing a null value if there are no
extra arguments to pass in bp_current_user_can(). Commit also includes
a unit test.

See #6730 (trunk).

File:

• trunk/tests/phpunit/testcases/core/caps.php (modified) (2 diffs)

trunk/tests/phpunit/testcases/core/caps.php

@@ -47 +47 @@
     }
 
+    /**
+     * @group bp_xprofile_change_field_visibility
+     */
+    public function test_bp_current_user_can_should_pass_null_in_args_parameter_if_empty() {
+        $u = $this->factory->user->create();
+        $this->set_current_user( $u );
+
+        /**
+         * Fake bp_get_the_profile_field_id() to pretend we're in the field loop and
+         * to avoid notices when checking 'bp_xprofile_change_field_visibility' cap
+         */
+        $GLOBALS['field'] = new stdClass;
+        $GLOBALS['field']->id = 1;
+
+        // Capture the cap's $args
+        add_filter( 'bp_xprofile_map_meta_caps', array( $this, 'check_cap_args' ), 10, 4 );
+
+        // Use a cap check that depends on a null value for a cap's args
+        bp_current_user_can( 'bp_xprofile_change_field_visibility' );
+
+        // Assert!
+        $this->assertEquals( null, $this->test_args[0] );
+
+        // Reset
+        remove_filter( 'bp_xprofile_map_meta_caps', array( $this, 'check_cap_args' ), 10, 4 );
+        unset( $GLOBALS['field'], $this->test_args );
+    }
+
     public function grant_cap_foo( $allcaps, $caps ) {
         if ( bp_is_root_blog() ) {
@@ -54 +82 @@
         return $allcaps;
     }
+
+    public function check_cap_args( $caps, $cap, $user_id, $args ) {
+        $this->test_args = $args;
+        return $caps;
+    }
 }