Merge pull request #3656 from 10up/chore/refactor-wc-tests

Do not extend a Test class
10up · Sep 27, 2023 · fa27532 · fa27532
2 parents 0daad8b + c411a02
commit fa27532
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 39 deletions.
diff --git a/tests/php/features/WooCommerce/TestWooCommerce.php b/tests/php/features/WooCommerce/TestWooCommerce.php
@@ -9,46 +9,12 @@
 
 use ElasticPress;
 
+require_once __DIR__ . '/WooCommerceBaseTestCase.php';
+
 /**
  * WC test class
  */
-class TestWooCommerce extends BaseTestCase {
-
-	/**
-	 * Setup each test.
-	 *
-	 * @since 2.1
-	 * @group woocommerce
-	 */
-	public function set_up() {
-		global $wpdb;
-		parent::set_up();
-		$wpdb->suppress_errors();
-
-		$admin_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
-
-		wp_set_current_user( $admin_id );
-
-		ElasticPress\Elasticsearch::factory()->delete_all_indices();
-		ElasticPress\Indexables::factory()->get( 'post' )->put_mapping();
-
-		ElasticPress\Indexables::factory()->get( 'post' )->sync_manager->sync_queue = [];
-
-		$this->setup_test_post_type();
-	}
-
-	/**
-	 * Clean up after each test. Reset our mocks
-	 *
-	 * @since 2.1
-	 * @group woocommerce
-	 */
-	public function tear_down() {
-		parent::tear_down();
-
-		$this->fired_actions = array();
-	}
-
+class TestWooCommerce extends WooCommerceBaseTestCase {
 	/**
 	 * Test search integration is on in general for product searches
 	 *

diff --git a/tests/php/features/WooCommerce/TestWooCommerceOrders.php b/tests/php/features/WooCommerce/TestWooCommerceOrders.php
@@ -10,10 +10,12 @@
 
 use ElasticPress;
 
+require_once __DIR__ . '/WooCommerceBaseTestCase.php';
+
 /**
  * WC orders test class
  */
-class TestWooCommerceOrders extends TestWooCommerce {
+class TestWooCommerceOrders extends WooCommerceBaseTestCase {
 	/**
 	 * Orders instance
 	 *

diff --git a/tests/php/features/WooCommerce/TestWooCommerceProduct.php b/tests/php/features/WooCommerce/TestWooCommerceProduct.php
@@ -10,10 +10,12 @@
 
 use ElasticPress;
 
+require_once __DIR__ . '/WooCommerceBaseTestCase.php';
+
 /**
  * WC products test class
  */
-class TestWooCommerceProduct extends TestWooCommerce {
+class TestWooCommerceProduct extends WooCommerceBaseTestCase {
 	/**
 	 * Products instance
 	 *

diff --git a/tests/php/features/WooCommerce/WooCommerceBaseTestCase.php b/tests/php/features/WooCommerce/WooCommerceBaseTestCase.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * WooCommerce Base Test Case
+ *
+ * @since 5.0.0
+ * @package elasticpress
+ */
+
+namespace ElasticPressTest;
+
+/**
+ * WooCommerceBaseTestCase class
+ */
+class WooCommerceBaseTestCase extends BaseTestCase {
+	/**
+	 * Setup each test.
+	 *
+	 * @group woocommerce
+	 */
+	public function set_up() {
+		global $wpdb;
+		parent::set_up();
+		$wpdb->suppress_errors();
+
+		$admin_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
+
+		wp_set_current_user( $admin_id );
+
+		\ElasticPress\Elasticsearch::factory()->delete_all_indices();
+		\ElasticPress\Indexables::factory()->get( 'post' )->put_mapping();
+
+		\ElasticPress\Indexables::factory()->get( 'post' )->sync_manager->sync_queue = [];
+
+		$this->setup_test_post_type();
+	}
+
+	/**
+	 * Clean up after each test. Reset our mocks
+	 *
+	 * @group woocommerce
+	 */
+	public function tear_down() {
+		parent::tear_down();
+
+		$this->fired_actions = array();
+	}
+}