From d3dd6046d5bfd3c9912625ee5ee81f382fa05119 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Sun, 16 Oct 2016 23:35:33 +0000 Subject: [PATCH] Role/Capability: Disregard the order of capabilities when testing that single site and multisite capability tests match. See #38191 git-svn-id: https://develop.svn.wordpress.org/trunk@38802 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/user/capabilities.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/phpunit/tests/user/capabilities.php b/tests/phpunit/tests/user/capabilities.php index 5a70aaae52..cba096bb84 100644 --- a/tests/phpunit/tests/user/capabilities.php +++ b/tests/phpunit/tests/user/capabilities.php @@ -285,13 +285,17 @@ class Tests_User_Capabilities extends WP_UnitTestCase { // test the tests function test_single_and_multisite_cap_tests_match() { - $single = $this->_getSingleSitePrimitiveCaps(); - $multi = $this->_getMultiSitePrimitiveCaps(); - $this->assertEquals( array_keys( $single ), array_keys( $multi ) ); + $single_primitive = array_keys( $this->_getSingleSitePrimitiveCaps() ); + $multi_primitive = array_keys( $this->_getMultiSitePrimitiveCaps() ); + sort( $single_primitive ); + sort( $multi_primitive ); + $this->assertEquals( $single_primitive, $multi_primitive ); - $single = $this->_getSingleSiteMetaCaps(); - $multi = $this->_getMultiSiteMetaCaps(); - $this->assertEquals( array_keys( $single ), array_keys( $multi ) ); + $single_meta = array_keys( $this->_getSingleSiteMetaCaps() ); + $multi_meta = array_keys( $this->_getMultiSiteMetaCaps() ); + sort( $single_meta ); + sort( $multi_meta ); + $this->assertEquals( $single_meta, $multi_meta ); } // test the tests