Merge pull request #96 from humanmade/backport-95-to-v3-branch

[Backport v3-branch] Ensure constants are defined during install
humanmade · Oct 6, 2020 · dfe4fb9 · dfe4fb9
2 parents 86e7104 + 22c566e
commit dfe4fb9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/inc/phpunit/bootstrap.php b/inc/phpunit/bootstrap.php
@@ -47,7 +47,6 @@
 /**
  * Setup ElasticPress on install.
  */
-define( 'EP_INDEX_PREFIX', 'tests_' );
 tests_add_filter( 'plugins_loaded', function () {
 	global $table_prefix;
 
@@ -83,11 +82,6 @@
 	}
 }, 21 );
 
-/**
- * Modify the cache keys to prevent conflicts.
- */
-define( 'WP_CACHE_KEY_SALT', 'phpunit' );
-
 // Load custom bootstrap code.
 if ( file_exists( Altis\PHPUNIT_PROJECT_ROOT . '/.config/tests-bootstrap.php' ) ) {
 	require Altis\PHPUNIT_PROJECT_ROOT . '/.config/tests-bootstrap.php';

diff --git a/inc/phpunit/config.php b/inc/phpunit/config.php
@@ -14,6 +14,12 @@
 defined( 'WP_TESTS_EMAIL' ) or define( 'WP_TESTS_EMAIL', 'admin@example.org' );
 defined( 'WP_TESTS_TITLE' ) or define( 'WP_TESTS_TITLE', 'Test Blog' );
 
+// Ensure cache key salt is different for test runs.
+defined( 'WP_CACHE_KEY_SALT' ) or define( 'WP_CACHE_KEY_SALT', 'phpunit' );
+
+// Ensure tests use their own ElasticPress indexes.
+defined( 'EP_INDEX_PREFIX' ) or define( 'EP_INDEX_PREFIX', 'tests_' );
+
 // Set tests table prefix.
 $table_prefix = 'wptests_';