Merge branch 'develop' into fix-intermittent-tests-fails

10up · Oct 11, 2022 · cc5e26b · cc5e26b
2 parents ca2c87f + 334ff90
commit cc5e26b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 55 deletions.
diff --git a/tests/php/features/TestProtectedContent.php b/tests/php/features/TestProtectedContent.php
@@ -70,8 +70,6 @@ public function testAdminNotOn() {
 
 		ElasticPress\Elasticsearch::factory()->refresh_indices();
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$query = new \WP_Query();
 
 		global $wp_the_query;
@@ -80,7 +78,7 @@ public function testAdminNotOn() {
 
 		$query->query( array() );
 
-		$this->assertTrue( empty( $this->fired_actions['ep_wp_query_search'] ) );
+		$this->assertNull( $query->elasticsearch_success );
 	}
 
 	/**
@@ -99,8 +97,6 @@ public function testAdminOn() {
 
 		ElasticPress\Elasticsearch::factory()->refresh_indices();
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$query = new \WP_Query();
 
 		global $wp_the_query;
@@ -109,7 +105,7 @@ public function testAdminOn() {
 
 		$wp_the_query->query( array() );
 
-		$this->assertTrue( ! empty( $this->fired_actions['ep_wp_query_search'] ) );
+		$this->assertTrue( $query->elasticsearch_success );
 	}
 
 	/**
@@ -129,8 +125,6 @@ public function testAdminOnDraft() {
 
 		ElasticPress\Elasticsearch::factory()->refresh_indices();
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$query = new \WP_Query();
 
 		global $wp_the_query;
@@ -143,7 +137,7 @@ public function testAdminOnDraft() {
 
 		$query->query( $args );
 
-		$this->assertTrue( ! empty( $this->fired_actions['ep_wp_query_search'] ) );
+		$this->assertTrue( $query->elasticsearch_success );
 		$this->assertEquals( 1, $query->post_count );
 		$this->assertEquals( 1, $query->found_posts );
 	}
@@ -174,8 +168,6 @@ public function testAdminOnDraftUpdated() {
 
 		ElasticPress\Elasticsearch::factory()->refresh_indices();
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$query = new \WP_Query();
 
 		global $wp_the_query;
@@ -188,7 +180,7 @@ public function testAdminOnDraftUpdated() {
 
 		$query->query( $args );
 
-		$this->assertTrue( ! empty( $this->fired_actions['ep_wp_query_search'] ) );
+		$this->assertTrue( $query->elasticsearch_success );
 		$this->assertEquals( 1, $query->post_count );
 		$this->assertEquals( 1, $query->found_posts );
 	}
@@ -211,8 +203,6 @@ public function testAdminCategories() {
 
 		ElasticPress\Elasticsearch::factory()->refresh_indices();
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$query = new \WP_Query();
 
 		global $wp_the_query;
@@ -230,7 +220,7 @@ public function testAdminCategories() {
 
 		$query->query( $args );
 
-		$this->assertTrue( ! empty( $this->fired_actions['ep_wp_query_search'] ) );
+		$this->assertTrue( $query->elasticsearch_success );
 		$this->assertEquals( 2, $query->post_count );
 		$this->assertEquals( 2, $query->found_posts );
 	}

diff --git a/tests/php/features/TestSearch.php b/tests/php/features/TestSearch.php
@@ -70,15 +70,13 @@ public function testSearchOn() {
 
 		ElasticPress\Elasticsearch::factory()->refresh_indices();
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$args = array(
 			's' => 'findme',
 		);
 
 		$query = new \WP_Query( $args );
 
-		$this->assertTrue( ! empty( $this->fired_actions['ep_wp_query_search'] ) );
+		$this->assertTrue( $query->elasticsearch_success );
 	}
 
 	/**
@@ -367,4 +365,3 @@ public function testExcerptSetting() {
 		$this->assertTrue( $settings['highlight_excerpt'] );
 	}
 }
-
diff --git a/tests/php/features/TestWooCommerce.php b/tests/php/features/TestWooCommerce.php
@@ -54,7 +54,7 @@ public function tearDown() {
 	}
 
 	/**
-	 * Test products post type query does get integrated when the feature is not active
+	 * Test products post type query does get integrated when the feature is active
 	 *
 	 * @since 2.1
 	 * @group woocommerce
@@ -73,8 +73,6 @@ public function testProductsPostTypeQueryOn() {
 
 		ElasticPress\Elasticsearch::factory()->refresh_indices();
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$args = array(
 			'post_type' => 'product',
 		);
@@ -84,8 +82,6 @@ public function testProductsPostTypeQueryOn() {
 		$this->assertTrue( $query->elasticsearch_success );
 		$this->assertEquals( 1, $query->post_count );
 		$this->assertEquals( 1, $query->found_posts );
-
-		$this->assertTrue( ! empty( $this->fired_actions['ep_wp_query_search'] ) );
 	}
 
 	/**
@@ -103,8 +99,6 @@ public function testProductsPostTypeQueryProductCatTax() {
 
 		ElasticPress\Elasticsearch::factory()->refresh_indices();
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$args = array(
 			'tax_query' => array(
 				array(
@@ -236,8 +230,6 @@ public function testSearchOnAllFrontEnd() {
 
 		ElasticPress\Elasticsearch::factory()->refresh_indices();
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$args = array(
 			's'         => 'findme',
 			'post_type' => 'product',
@@ -250,7 +242,7 @@ public function testSearchOnAllFrontEnd() {
 
 	/**
 	 * Test the addition of variations skus to product meta
-	 * 
+	 *
 	 * @since 4.2.0
 	 * @group woocommerce
 	 */
@@ -287,7 +279,7 @@ public function testAddVariationsSkusMeta() {
 
 	/**
 	 * Test the translate_args_admin_products_list method
-	 * 
+	 *
 	 * @since 4.2.0
 	 * @group woocommerce
 	 */
@@ -329,7 +321,7 @@ public function testTranslateArgsAdminProductsList() {
 
 	/**
 	 * Test the ep_woocommerce_admin_products_list_search_fields filter
-	 * 
+	 *
 	 * @since 4.2.0
 	 * @group woocommerce
 	 */

diff --git a/tests/php/includes/classes/BaseTestCase.php b/tests/php/includes/classes/BaseTestCase.php
@@ -48,15 +48,6 @@ public function action_delete_post() {
 		$this->fired_actions['ep_delete_post'] = true;
 	}
 
-	/**
-	 * Helper function to test whether a EP search has happened
-	 *
-	 * @since 1.0
-	 */
-	public function action_wp_query_search() {
-		$this->fired_actions['ep_wp_query_search'] = true;
-	}
-
 	/**
 	 * Helper function to check post sync args
 	 *

diff --git a/tests/php/indexables/TestPost.php b/tests/php/indexables/TestPost.php
@@ -199,8 +199,6 @@ public function testWPQuerySearchContent() {
 			's' => 'findme',
 		);
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$query = new \WP_Query( $args );
 
 		$this->assertTrue( $query->elasticsearch_success );
@@ -251,8 +249,6 @@ public function testWPQuerySearchTitle() {
 			's' => 'findme',
 		);
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$query = new \WP_Query( $args );
 
 		$this->assertTrue( $query->elasticsearch_success );
@@ -412,7 +408,6 @@ public function testPostTermSyncHierarchyMultipleLevelQuery() {
 		ElasticPress\Indexables::factory()->get( 'post' )->index( $post_id, true );
 		ElasticPress\Elasticsearch::factory()->refresh_indices();
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
 		$query = new \WP_Query( array( 's' => '#findme' ) );
 
 		$this->assertTrue( $query->elasticsearch_success );
@@ -550,8 +545,6 @@ public function testWPQuerySearchExcerpt() {
 			's' => 'findme',
 		);
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$query = new \WP_Query( $args );
 
 		$this->assertTrue( $query->elasticsearch_success );
@@ -3108,8 +3101,6 @@ public function testExcludeFromSearch() {
 			's' => 'findme',
 		);
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$query = new \WP_Query( $args );
 
 		$this->assertTrue( $query->elasticsearch_success );

diff --git a/tests/php/indexables/TestPostMultisite.php b/tests/php/indexables/TestPostMultisite.php
@@ -198,8 +198,6 @@ public function testWPQuerySearchContent() {
 			'sites' => 'all',
 		);
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$query = new \WP_Query( $args );
 
 		$this->assertTrue( $query->elasticsearch_success );
@@ -450,8 +448,6 @@ public function testWPQuerySearchTitle() {
 			'sites' => 'all',
 		);
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$query = new \WP_Query( $args );
 
 		$this->assertTrue( $query->elasticsearch_success );
@@ -499,8 +495,6 @@ public function testWPQuerySearchExcerpt() {
 			'sites' => 'all',
 		);
 
-		add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );
-
 		$query = new \WP_Query( $args );
 
 		$this->assertTrue( $query->elasticsearch_success );