Merge pull request #97 from humanmade/backport-95-to-v4-branch

[Backport v4-branch] Ensure constants are defined during install
humanmade · Oct 6, 2020 · 13eb453 · 13eb453
2 parents e0a50ba + 343611b
commit 13eb453
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
@@ -49,7 +49,6 @@
 /**
  * Setup ElasticPress on install.
  */
-define( 'EP_INDEX_PREFIX', 'tests_' );
 tests_add_filter( 'plugins_loaded', function () {
  global $table_prefix;
 
@@ -85,11 +84,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
@@ -16,6 +16,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_';