Move cache key salt to config file

humanmade · Oct 5, 2020 · 343611b · 343611b
1 parent 57e9a64
commit 343611b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/inc/phpunit/bootstrap.php b/inc/phpunit/bootstrap.php
@@ -84,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,9 @@
 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_' );