Merge pull request #3202 from 10up/chore/improve-cli-commands-tests-c…

…overage Improve CLI commands tests coverage
10up · Dec 16, 2022 · 38a4ad1 · 38a4ad1
2 parents b3f4390 + dd2cc48
commit 38a4ad1
Show file tree

Hide file tree

Showing 6 changed files with 551 additions and 83 deletions.
diff --git a/includes/classes/Command.php b/includes/classes/Command.php
@@ -19,7 +19,9 @@
 use ElasticPress\Indexables as Indexables;
 
 if ( ! defined( 'ABSPATH' ) ) {
+	// @codeCoverageIgnoreStart
 	exit; // Exit if accessed directly.
+	// @codeCoverageIgnoreEnd
 }
 
 /**
@@ -221,10 +223,7 @@ public function put_mapping( $args, $assoc_args ) {
 		$this->maybe_change_index_prefix( $assoc_args );
 		$this->connect_check();
 		$this->index_occurring();
-
-		if ( ! $this->put_mapping_helper( $args, $assoc_args ) ) {
-			exit( 1 );
-		}
+		$this->put_mapping_helper( $args, $assoc_args );
 	}
 
 	/**
@@ -286,9 +285,7 @@ private function put_mapping_helper( $args, $assoc_args ) {
 					if ( $result ) {
 						WP_CLI::success( esc_html__( 'Mapping sent', 'elasticpress' ) );
 					} else {
-						WP_CLI::error( esc_html__( 'Mapping failed', 'elasticpress' ), false );
-
-						return false;
+						WP_CLI::error( esc_html__( 'Mapping failed', 'elasticpress' ) );
 					}
 				}
 
@@ -322,9 +319,7 @@ private function put_mapping_helper( $args, $assoc_args ) {
 				if ( $result ) {
 					WP_CLI::success( esc_html__( 'Mapping sent', 'elasticpress' ) );
 				} else {
-					WP_CLI::error( esc_html__( 'Mapping failed', 'elasticpress' ), false );
-
-					return false;
+					WP_CLI::error( esc_html__( 'Mapping failed', 'elasticpress' ) );
 				}
 			}
 		}
@@ -359,9 +354,7 @@ private function put_mapping_helper( $args, $assoc_args ) {
 			if ( $result ) {
 				WP_CLI::success( esc_html__( 'Mapping sent', 'elasticpress' ) );
 			} else {
-				WP_CLI::error( esc_html__( 'Mapping failed', 'elasticpress' ), false );
-
-				return false;
+				WP_CLI::error( esc_html__( 'Mapping failed', 'elasticpress' ) );
 			}
 		}
 
@@ -611,6 +604,8 @@ public function epio_set_autosuggest( $args, $assoc_args ) {
 		add_action( 'ep_epio_wp_cli_set_autosuggest', [ $autosuggest_feature, 'epio_send_autosuggest_public_request' ] );
 
 		do_action( 'ep_epio_wp_cli_set_autosuggest', $args, $assoc_args );
+
+		WP_CLI::success( esc_html__( 'Done.', 'elasticpress' ) );
 	}
 
 	/**
@@ -649,7 +644,7 @@ public function delete_transient_on_int( $signal_no ) {
 		if ( SIGINT === $signal_no ) {
 			$this->delete_transient();
 			WP_CLI::log( esc_html__( 'Indexing cleaned up.', 'elasticpress' ) );
-			exit;
+			WP_CLI::halt();
 		}
 	}
 
@@ -1376,7 +1371,7 @@ public function stop_on_failed_mapping( $index_meta, $indexable, $result ) {
 		if ( ! $result ) {
 			$this->delete_transient();
 
-			exit( 1 );
+			WP_CLI::error( esc_html__( 'Mapping Failed.', 'elasticpress' ) );
 		}
 	}
 

diff --git a/includes/classes/DeprecatedCommand.php b/includes/classes/DeprecatedCommand.php
@@ -11,7 +11,9 @@
 use \WP_CLI as WP_CLI;
 
 if ( ! defined( 'ABSPATH' ) ) {
+	// @codeCoverageIgnoreStart
 	exit; // Exit if accessed directly.
+	// @codeCoverageIgnoreEnd
 }
 
 /**

diff --git a/includes/classes/IndexHelper.php b/includes/classes/IndexHelper.php
@@ -1139,6 +1139,7 @@ protected function stop_the_insanity() {
 	 * @since 4.0.0
 	 */
 	public function clear_index_meta() {
+		$this->index_meta = false;
 		Utils\delete_option( 'ep_index_meta', false );
 	}
 

diff --git a/includes/classes/Indexables.php b/includes/classes/Indexables.php
@@ -35,6 +35,16 @@ public function register( Indexable $indexable ) {
 		$this->registered_indexables[ $indexable->slug ] = $indexable;
 	}
 
+	/**
+	 * Unregister an indexable instance
+	 *
+	 * @param  string $slug Indexable type slug.
+	 * @since 4.4.1
+	 */
+	public function unregister( $slug ) {
+		unset( $this->registered_indexables[ $slug ] );
+	}
+
 	/**
 	 * Get an indexable instance given a slug
 	 *