diff --git a/.github/actions/run-e2e-tests/action.yml b/.github/actions/run-e2e-tests/action.yml index 053e11027f..a5b77c7a83 100644 --- a/.github/actions/run-e2e-tests/action.yml +++ b/.github/actions/run-e2e-tests/action.yml @@ -14,5 +14,4 @@ runs: env: RUN_EE: ${{ inputs.runEE }} JEST_OPTIONS: ${{ inputs.jestOptions }} - STRAPI_FEATURES_FUTURE_RELEASES_SCHEDULING: ${{ inputs.enableFutureFeatures }} shell: bash diff --git a/tests/api/core/content-manager/preview/preview.test.api.ts b/tests/api/core/content-manager/preview/preview.test.api.ts index b24306c6be..e94d7c8a61 100644 --- a/tests/api/core/content-manager/preview/preview.test.api.ts +++ b/tests/api/core/content-manager/preview/preview.test.api.ts @@ -1,6 +1,5 @@ import { createStrapiInstance } from 'api-tests/strapi'; import { createAuthRequest } from 'api-tests/request'; -import { describeOnCondition } from 'api-tests/utils'; import { createTestBuilder } from 'api-tests/builder'; const collectionTypeUid = 'api::product.product'; @@ -41,11 +40,7 @@ const singleTypeModel = { }, }; -const edition = process.env.STRAPI_DISABLE_EE === 'true' ? 'CE' : 'EE'; - -// TODO: Remove skip when future flag is removed -// describeOnCondition(edition === 'EE')('Preview', () => { -describeOnCondition(false)('Preview', () => { +describe('Preview', () => { const builder = createTestBuilder(); let strapi; let rq; diff --git a/tests/e2e/app-template/config/features.js b/tests/e2e/app-template/config/features.js index 725561007f..b2bbf1f976 100644 --- a/tests/e2e/app-template/config/features.js +++ b/tests/e2e/app-template/config/features.js @@ -1,6 +1,3 @@ module.exports = ({ env }) => ({ - future: { - contentReleasesScheduling: env.bool('STRAPI_FEATURES_FUTURE_RELEASES_SCHEDULING', false), - preview: true, - }, + future: {}, }); diff --git a/tests/e2e/tests/content-manager/preview.spec.ts b/tests/e2e/tests/content-manager/preview.spec.ts index 85eaeeca10..623a0f2d5b 100644 --- a/tests/e2e/tests/content-manager/preview.spec.ts +++ b/tests/e2e/tests/content-manager/preview.spec.ts @@ -1,12 +1,10 @@ -import { test, expect, Page } from '@playwright/test'; +import { test, expect } from '@playwright/test'; import { login } from '../../utils/login'; import { resetDatabaseAndImportDataFromPath } from '../../utils/dts-import'; -import { clickAndWait, describeOnCondition, findAndClose, skipCtbTour } from '../../utils/shared'; +import { clickAndWait, findAndClose, skipCtbTour } from '../../utils/shared'; import { resetFiles } from '../../utils/file-reset'; -const edition = process.env.STRAPI_DISABLE_EE === 'true' ? 'CE' : 'EE'; - -describeOnCondition(edition === 'EE')('Preview', () => { +test.describe('Preview', () => { test.beforeEach(async ({ page }) => { await resetDatabaseAndImportDataFromPath('with-admin.tar', (cts) => cts, { coreStore: false }); await resetFiles();