Set permissions in tests instead of setup to prevent changing permiss…

…ions for other tests that don't require it

tests/phpunit/tests/rest-api/rest-global-styles-controller.php

@@ -66,10 +66,6 @@ public static function wpSetupBeforeClass( $factory ) {
 			)
 		);
 
-		if ( is_multisite() ) {
-			grant_super_admin( self::$admin_id );
-		}
-
 		// This creates the global styles for the current theme.
 		self::$global_styles_id = $factory->post->create(
 			array(
@@ -543,6 +539,9 @@ public function test_assign_edit_css_action_admin() {
 	 */
 	public function test_update_item_valid_styles_css() {
 		wp_set_current_user( self::$admin_id );
+		if ( is_multisite() ) {
+			grant_super_admin( self::$admin_id );
+		}
 		$request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$global_styles_id );
 		$request->set_body_params(
 			array(
@@ -560,6 +559,9 @@ public function test_update_item_valid_styles_css() {
 	 */
 	public function test_update_item_invalid_styles_css() {
 		wp_set_current_user( self::$admin_id );
+		if ( is_multisite() ) {
+			grant_super_admin( self::$admin_id );
+		}
 		$request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$global_styles_id );
 		$request->set_body_params(
 			array(
@@ -569,5 +571,4 @@ public function test_update_item_invalid_styles_css() {
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_custom_css_illegal_markup', $response, 400 );
 	}
-
 }

tests/phpunit/tests/theme/wpThemeJson.php

@@ -21,13 +21,6 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
 	 */
 	private static $administrator_id;
 
-	/**
-	 * User ID.
-	 *
-	 * @var int
-	 */
-	private static $user_id;
-
 	public static function set_up_before_class() {
 		parent::set_up_before_class();
 
@@ -40,8 +33,6 @@ public static function set_up_before_class() {
 		if ( is_multisite() ) {
 			grant_super_admin( self::$administrator_id );
 		}
-
-		static::$user_id = self::factory()->user->create();
 	}
 
 	/**