convert base config to a function instead of const

elastic · Sep 19, 2023 · 75cde75 · 75cde75
1 parent 7ec96a3
commit 75cde75
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/x-pack/plugins/security_solution/public/management/cypress/cypress.config.ts b/x-pack/plugins/security_solution/public/management/cypress/cypress.config.ts
@@ -6,21 +6,21 @@
  */
 
 import { defineCypressConfig } from '@kbn/cypress-config';
-import { CY_BASE_CONFIG } from './cypress_base.config';
+import { getCypressBaseConfig } from './cypress_base.config';
 
 import { dataLoaders } from './support/data_loaders';
 
 export default defineCypressConfig({
-  ...CY_BASE_CONFIG,
+  ...getCypressBaseConfig(),
 
   env: {
-    ...CY_BASE_CONFIG.env,
+    ...getCypressBaseConfig().env,
 
     grepTags: '@ess',
   },
 
   e2e: {
-    ...CY_BASE_CONFIG.e2e,
+    ...getCypressBaseConfig().e2e,
 
     specPattern: 'public/management/cypress/e2e/mocked_data/',
     setupNodeEvents: (on, config) => {

diff --git a/x-pack/plugins/security_solution/public/management/cypress/cypress_base.config.ts b/x-pack/plugins/security_solution/public/management/cypress/cypress_base.config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-export const CY_BASE_CONFIG = {
+export const getCypressBaseConfig = () => ({
   reporter: '../../../../node_modules/cypress-multi-reporters',
   reporterOptions: {
     configFile: './public/management/reporter_config.json',
@@ -51,4 +51,4 @@ export const CY_BASE_CONFIG = {
     supportFile: 'public/management/cypress/support/e2e.ts',
     experimentalRunAllSpecs: true,
   },
-};
+});
diff --git a/x-pack/plugins/security_solution/public/management/cypress/cypress_endpoint.config.ts b/x-pack/plugins/security_solution/public/management/cypress/cypress_endpoint.config.ts
@@ -6,18 +6,18 @@
  */
 
 import { defineCypressConfig } from '@kbn/cypress-config';
-import { CY_BASE_CONFIG } from './cypress_base.config';
+import { getCypressBaseConfig } from './cypress_base.config';
 
 import { dataLoaders, dataLoadersForRealEndpoints } from './support/data_loaders';
 
 import { responseActionTasks } from './support/response_actions';
 
 // eslint-disable-next-line import/no-default-export
 export default defineCypressConfig({
-  ...CY_BASE_CONFIG,
+  ...getCypressBaseConfig(),
 
   env: {
-    ...CY_BASE_CONFIG.env,
+    ...getCypressBaseConfig().env,
 
     'cypress-react-selector': {
       root: '#security-solution-app',
@@ -27,7 +27,7 @@ export default defineCypressConfig({
   },
 
   e2e: {
-    ...CY_BASE_CONFIG.e2e,
+    ...getCypressBaseConfig().e2e,
 
     experimentalMemoryManagement: true,
     experimentalInteractiveRunEvents: true,

diff --git a/...plugins/security_solution/public/management/cypress/cypress_endpoint_serverless.config.ts b/...plugins/security_solution/public/management/cypress/cypress_endpoint_serverless.config.ts
@@ -6,16 +6,16 @@
  */
 
 import { defineCypressConfig } from '@kbn/cypress-config';
-import { CY_BASE_CONFIG } from './cypress_base.config';
+import { getCypressBaseConfig } from './cypress_base.config';
 import { dataLoaders } from './support/data_loaders';
 import { responseActionTasks } from './support/response_actions';
 
 // eslint-disable-next-line import/no-default-export
 export default defineCypressConfig({
-  ...CY_BASE_CONFIG,
+  ...getCypressBaseConfig(),
 
   env: {
-    ...CY_BASE_CONFIG.env,
+    ...getCypressBaseConfig().env,
 
     IS_SERVERLESS: true,
     grepTags: '@serverless --@brokenInServerless',
@@ -26,6 +26,8 @@ export default defineCypressConfig({
   },
 
   e2e: {
+    ...getCypressBaseConfig().e2e,
+
     experimentalMemoryManagement: true,
     experimentalInteractiveRunEvents: true,
 

diff --git a/x-pack/plugins/security_solution/public/management/cypress/cypress_serverless.config.ts b/x-pack/plugins/security_solution/public/management/cypress/cypress_serverless.config.ts
@@ -6,23 +6,23 @@
  */
 
 import { defineCypressConfig } from '@kbn/cypress-config';
-import { CY_BASE_CONFIG } from './cypress_base.config';
+import { getCypressBaseConfig } from './cypress_base.config';
 import { dataLoaders } from './support/data_loaders';
 
 // eslint-disable-next-line import/no-default-export
 export default defineCypressConfig({
-  ...CY_BASE_CONFIG,
+  ...getCypressBaseConfig(),
 
   env: {
-    ...CY_BASE_CONFIG.env,
+    ...getCypressBaseConfig().env,
 
     IS_SERVERLESS: true,
 
     grepTags: '@serverless --@brokenInServerless',
   },
 
   e2e: {
-    ...CY_BASE_CONFIG.e2e,
+    ...getCypressBaseConfig().e2e,
 
     specPattern: 'public/management/cypress/e2e/mocked_data/',