diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ea6bcbd1..b12c365c6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -495,7 +495,7 @@ jobs: REDIS_URL: 'redis://127.0.0.1:6379' S3_REGION: '' # optional, defaults to 'us-east-1' ENCRYPTION_KEYS_PATH: 'test/assets/automate/encryptionKeys.json' - FF_BILLING_INTEGRATION_ENABLED: 'true' + ENABLE_ALL_FFS: 'true' RATELIMITER_ENABLED: 'false' steps: - checkout diff --git a/packages/server/package.json b/packages/server/package.json index 588f8e006..a01cdd8a5 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -23,6 +23,7 @@ "dev:clean": "yarn build:clean && yarn dev", "dev:server:test": "cross-env DISABLE_NOTIFICATIONS_CONSUMPTION=true NODE_ENV=test LOG_LEVEL=silent LOG_PRETTY=true node ./bin/ts-www", "test": "cross-env NODE_ENV=test LOG_LEVEL=silent LOG_PRETTY=true mocha", + "test:all-ff": "cross-env ENABLE_ALL_FFS=true yarn test", "test:multiregion": "cross-env RUN_TESTS_IN_MULTIREGION_MODE=true FF_WORKSPACES_MODULE_ENABLED=true FF_WORKSPACES_MULTI_REGION_ENABLED=true yarn test", "test:no-ff": "cross-env DISABLE_ALL_FFS=true yarn test", "test:coverage": "cross-env NODE_ENV=test LOG_LEVEL=silent LOG_PRETTY=true nyc --reporter lcov mocha", diff --git a/packages/shared/src/environment/index.ts b/packages/shared/src/environment/index.ts index 75cd9cd04..64d27c882 100644 --- a/packages/shared/src/environment/index.ts +++ b/packages/shared/src/environment/index.ts @@ -3,6 +3,8 @@ import { z } from 'zod' const isDisableAllFFsMode = () => ['true', '1'].includes(process.env.DISABLE_ALL_FFS || '') +const isEnableAllFFsMode = () => + ['true', '1'].includes(process.env.ENABLE_ALL_FFS || '') const parseFeatureFlags = () => { //INFO @@ -68,10 +70,10 @@ const parseFeatureFlags = () => { } }) - // Can be used to disable all feature flags for testing purposes - if (isDisableAllFFsMode()) { + // Can be used to disable/enable all feature flags for testing purposes + if (isDisableAllFFsMode() || isEnableAllFFsMode()) { for (const key of Object.keys(res)) { - ;(res as Record)[key] = false + ;(res as Record)[key] = !isDisableAllFFsMode() // disable takes precedence } }