Remove the gutenberg-block-directory experimental flag (#23389)

* Remove the gutenberg-block-directory experimental flag This removes the flag and its UI, enabling the block directory by default. Note that it does not change the API namespace, which is still `__experimental`. * Remove the experiment toggle in block directory e2e. * Move e2e tests into the editor folder and out of experiments. Co-authored-by: dufresnesteven <[email protected]>
WordPress · Jun 24, 2020 · 5df2314 · 5df2314
1 parent 2e20984
commit 5df2314
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 33 deletions.
diff --git a/lib/block-directory.php b/lib/block-directory.php
@@ -6,7 +6,6 @@
  */
 
 if (
-	gutenberg_is_experiment_enabled( 'gutenberg-block-directory' ) &&
 	! has_action( 'admin_enqueue_scripts', 'enqueue_block_editor_assets_block_directory' )
 ) {
 	/**

diff --git a/lib/experiments-page.php b/lib/experiments-page.php
@@ -62,17 +62,6 @@ function gutenberg_initialize_experiments_settings() {
 			'id'    => 'gutenberg-navigation',
 		)
 	);
-	add_settings_field(
-		'gutenberg-block-directory',
-		__( 'Block Directory', 'gutenberg' ),
-		'gutenberg_display_experiment_field',
-		'gutenberg-experiments',
-		'gutenberg_experiments_section',
-		array(
-			'label' => __( 'Enable block directory search', 'gutenberg' ),
-			'id'    => 'gutenberg-block-directory',
-		)
-	);
 	add_settings_field(
 		'gutenberg-full-site-editing',
 		__( 'Full Site Editing', 'gutenberg' ),
@@ -143,7 +132,6 @@ function gutenberg_display_experiment_section() {
 function gutenberg_experiments_editor_settings( $settings ) {
 	$experiments_settings = array(
 		'__experimentalEnableLegacyWidgetBlock'   => gutenberg_is_experiment_enabled( 'gutenberg-widget-experiments' ),
-		'__experimentalBlockDirectory'            => gutenberg_is_experiment_enabled( 'gutenberg-block-directory' ),
 		'__experimentalEnableFullSiteEditing'     => gutenberg_is_experiment_enabled( 'gutenberg-full-site-editing' ),
 		'__experimentalEnableFullSiteEditingDemo' => gutenberg_is_experiment_enabled( 'gutenberg-full-site-editing-demo' ),
 	);

diff --git a/lib/rest-api.php b/lib/rest-api.php
@@ -119,10 +119,6 @@ function gutenberg_register_rest_widget_areas() {
  * @since 6.5.0
  */
 function gutenberg_register_rest_block_directory() {
-	if ( ! gutenberg_is_experiment_enabled( 'gutenberg-block-directory' ) ) {
-		return;
-	}
-
 	$block_directory_controller = new WP_REST_Block_Directory_Controller();
 	$block_directory_controller->register_routes();
 }
@@ -159,10 +155,6 @@ function gutenberg_register_rest_customizer_nonces() {
  * Registers the Plugins REST API routes.
  */
 function gutenberg_register_plugins_endpoint() {
-	if ( ! gutenberg_is_experiment_enabled( 'gutenberg-block-directory' ) ) {
-		return;
-	}
-
 	$plugins = new WP_REST_Plugins_Controller();
 	$plugins->register_routes();
 }

diff --git a/...pshots__/block-directory-add.test.js.snap → ...pshots__/block-directory-add.test.js.snap b/...pshots__/block-directory-add.test.js.snap → ...pshots__/block-directory-add.test.js.snap
diff --git a/...s/experiments/block-directory-add.test.js → ...ditor/plugins/block-directory-add.test.js b/...s/experiments/block-directory-add.test.js → ...ditor/plugins/block-directory-add.test.js
@@ -8,10 +8,6 @@ import {
 	getEditedPostContent,
 	createJSONResponse,
 } from '@wordpress/e2e-test-utils';
-/**
- * Internal dependencies
- */
-import { useExperimentalFeatures } from '../../experimental-features';
 
 // Urls to mock
 const SEARCH_URLS = [
@@ -173,8 +169,6 @@ const matchUrl = ( reqUrl, urls ) => {
 };
 
 describe( 'adding blocks from block directory', () => {
-	useExperimentalFeatures( [ '#gutenberg-block-directory' ] );
-
 	beforeEach( async () => {
 		await createNewPost();
 	} );

diff --git a/phpunit/bootstrap.php b/phpunit/bootstrap.php
@@ -70,12 +70,6 @@ function fail_if_died( $message ) {
 }
 tests_add_filter( 'wp_die_handler', 'fail_if_died' );
 
-$GLOBALS['wp_tests_options'] = array(
-	'gutenberg-experiments' => array(
-		'gutenberg-block-directory' => '1',
-	),
-);
-
 // Start up the WP testing environment.
 require $_tests_dir . '/includes/bootstrap.php';
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
      */
     if (
-    	gutenberg_is_experiment_enabled( 'gutenberg-block-directory' ) &&
     	! has_action( 'admin_enqueue_scripts', 'enqueue_block_editor_assets_block_directory' )
     ) {
     	/**
@@ Expand Down @@