move check for jetpack branch into jurassic_ninja_add_features_after_…

…auto_login filter

features/gutenpack.php

@@ -19,26 +19,23 @@
 			} else {
 				debug( '%s: Adding latest stable Gutenpack blocks. Jetpack dir is %s', $domain, $jetpack_dir );
 			}
-
+			// Force Jetpack Beta given that after this PR got merged,
+			// we can only test Gutenblocks with Jetpack in `master`
+			// or a new branch derived from latest `master`.
+			// https://github.com/Automattic/jetpack/pull/10154
+			$features['jetpack-beta'] = true;
+			if ( ! isset( $features['branch'] ) ) {
+				$features['branch'] = 'master';
+			}
+			// Also, force regular jetpack out of the equation
+			$features['jetpack'] = false;
 			add_gutenpack( $calypsobranch, $jetpack_dir );
 		}
 	}, 100, 3 );
 
 	add_filter( 'jurassic_ninja_rest_create_request_features', function( $features, $json_params ) {
 		if ( isset( $json_params['gutenpack'] ) ) {
 			$features['gutenpack'] = $json_params['gutenpack'];
-			if ( $features['gutenpack'] ) {
-				// Force Jetpack Beta given that after this PR got merged,
-				// we can only test Gutenblocks with Jetpack in `master`
-				// or a new branch derived from latest `master`.
-				// https://github.com/Automattic/jetpack/pull/10154
-				$features['jetpack-beta'] = true;
-				if ( ! isset( $features['branch'] ) ) {
-					$features['branch'] = 'master';
-				}
-				// Also, force regular jetpack out of the equation
-				$features['jetpack'] = false;
-			}
 			if (
 				$features['gutenpack'] &&
 				isset( $json_params['calypsobranch'] ) &&