From 4ab6e48237ef6d4cdd75c7721cd994539ced0ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20Wei=C3=9F?= <34910067+loweisz@users.noreply.github.com> Date: Tue, 18 May 2021 09:30:07 +0200 Subject: [PATCH] Revert: "chore: test that SDK respects alias (#710)" (#717) This reverts commit b86ee28e83d4492c7c7c0a2ea3018f95c85cf4d2. --- .../integration/entry-editor-aliased.spec.ts | 46 ------------------- test/cypress/utils/paths.ts | 9 ---- test/integration/index.ts | 17 +------ test/integration/local.ts | 2 - .../tasks/create-configuration-files.ts | 3 -- .../tasks/create-new-environment.ts | 7 +-- .../tasks/delete-new-environment-alias.ts | 16 ------- 7 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 test/cypress/integration/entry-editor-aliased.spec.ts delete mode 100644 test/integration/tasks/delete-new-environment-alias.ts diff --git a/test/cypress/integration/entry-editor-aliased.spec.ts b/test/cypress/integration/entry-editor-aliased.spec.ts deleted file mode 100644 index b24c6ce045..0000000000 --- a/test/cypress/integration/entry-editor-aliased.spec.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { entryAliased } from '../utils/paths' -import { role } from '../utils/role' - -const post = { - id: Cypress.env('entries').onValueChanged, - title: 'My post to test onValueChanged', - body: 'body value', -} - -const iframeSelector = '[data-test-id="cf-ui-workbench-content"] iframe' -const entryExtensionSelector = 'cf-ui-card' - -context(`Aliased Entry editor extension (${role})`, () => { - beforeEach(() => { - cy.setupBrowserStorage() - cy.visit(entryAliased(post.id)) - cy.findByTestId('workbench-title').should(($title) => { - expect($title).to.exist - }) - - cy.waitForIframeWithTestId(entryExtensionSelector) - cy.get('[data-test-id="cf-ui-workbench-content"]').within(() => { - cy.get('iframe').captureIFrameAs('extension') - }) - }) - - it('verifies that API calls use the active Alias', () => { - const aliasId = Cypress.env('activeAliasId') - const spaceId = Cypress.env('activeSpaceId') - cy.intercept({ - method: 'GET', - url: `/spaces/${spaceId}/environments/*/content_types`, - }).as('contentTypesRequest') - cy.intercept({ - method: 'GET', - url: `spaces/${spaceId}/environments/*/entries/${post.id}/tasks`, - }).as('tasksRequest') - - cy.getSdk(iframeSelector).then(async (sdk) => { - sdk.space.getContentTypes() - cy.wait('@contentTypesRequest').its('request.url').should('include', aliasId) - sdk.entry.getTasks() - cy.wait('@tasksRequest').its('request.url').should('include', aliasId) - }) - }) -}) diff --git a/test/cypress/utils/paths.ts b/test/cypress/utils/paths.ts index 29f9234900..78b17b74fe 100644 --- a/test/cypress/utils/paths.ts +++ b/test/cypress/utils/paths.ts @@ -2,16 +2,11 @@ import { role } from './role' const activeSpaceId = Cypress.env('activeSpaceId') const activeEnvironmentId = Cypress.env('activeEnvironmentId') -const activeAliasId = Cypress.env('activeAliasId') export function entriesList() { return `/spaces/${activeSpaceId}/environments/${activeEnvironmentId}/entries` } -export function entriesListAliased() { - return `/spaces/${activeSpaceId}/environments/${activeAliasId}/entries` -} - export function pageExtensionMaster(extensionId: string) { return `/spaces/${activeSpaceId}/extensions/${extensionId}` } @@ -24,10 +19,6 @@ export function entry(id: string) { return `${entriesList()}/${id}` } -export function entryAliased(id: string) { - return `${entriesListAliased()}/${id}` -} - export function assetsList() { return `/spaces/${activeSpaceId}/environments/${activeEnvironmentId}/assets` } diff --git a/test/integration/index.ts b/test/integration/index.ts index 7917763d55..1adfea56c8 100644 --- a/test/integration/index.ts +++ b/test/integration/index.ts @@ -10,7 +10,6 @@ import { } from './tasks/create-configuration-files' import createEnvironment from './tasks/create-new-environment' import deleteEnvironment from './tasks/delete-new-environment' -import deleteEnvironmentAlias from './tasks/delete-new-environment-alias' import deleteStaleEnvironments from './tasks/delete-stale-environments' import deployExtensions from './tasks/deploy-extensions' import runCypress from './tasks/run-cypress' @@ -47,18 +46,9 @@ function listAllEnvironmentVariables() { } let tempEnvironmentId: any -let tempAliasId: any const tempEntries: { environmentId: string; entryId: string }[] = [] const cleanup = async () => { - if (tempAliasId) { - try { - await asyncRetry(() => deleteEnvironmentAlias(tempAliasId), { retries: 3 }) - } catch (e) { - console.log(e) - throw new Error('Failed to remove environment alias') - } - } if (tempEnvironmentId) { try { await asyncRetry(() => deleteEnvironment(tempEnvironmentId), { retries: 3 }) @@ -87,14 +77,12 @@ const run = async () => { } try { - const { environmentId, aliasId } = await asyncRetry( + tempEnvironmentId = await asyncRetry( () => { return createEnvironment() }, { retries: 3 } ) - tempEnvironmentId = environmentId - tempAliasId = aliasId } catch (e) { console.log(e) throw new Error('Failed to create a new environment') @@ -114,7 +102,6 @@ const run = async () => { environmentId: tempEnvironmentId, role: 'admin', entries: entryIds, - aliasId: tempAliasId, }) await runCypress('admin') @@ -125,7 +112,6 @@ const run = async () => { environmentId: tempEnvironmentId, role: 'editor', entries: entryIds, - aliasId: tempAliasId, }) await runCypress('editor', true) @@ -141,7 +127,6 @@ const run = async () => { environmentId: 'master-test', role: 'editorMasterOnly', entries: newEntryIds, - aliasId: tempAliasId, }) await runCypress('editorMasterOnly', true) } diff --git a/test/integration/local.ts b/test/integration/local.ts index 95929ba106..6eb2fcba89 100644 --- a/test/integration/local.ts +++ b/test/integration/local.ts @@ -14,7 +14,6 @@ const config = { spaceId: process.env.CONTENTFUL_SPACE_ID!, baseUrl: process.env.CONTENTFUL_APP!, environmentId: process.env.CONTENTFUL_LOCAL_TESTING_ENV!, - aliasId: process.env.CONTENTFUL_LOCAL_TESTING_ALIAS!, testLocalSdk: process.env.TEST_LOCAL_SDK === 'true', } @@ -60,7 +59,6 @@ async function run() { managementToken: config.managementToken, spaceId: config.spaceId, environmentId: config.environmentId, - aliasId: config.aliasId, role: 'admin', entries: entryIds, }) diff --git a/test/integration/tasks/create-configuration-files.ts b/test/integration/tasks/create-configuration-files.ts index b1698195f2..ebf231ba14 100644 --- a/test/integration/tasks/create-configuration-files.ts +++ b/test/integration/tasks/create-configuration-files.ts @@ -6,21 +6,18 @@ export async function createCypressConfiguration({ environmentId, role, entries, - aliasId, }: { managementToken: string spaceId: string environmentId: string role: string entries: Record - aliasId: string }) { printStepTitle(`${role}: Creating Cypress configuration based on environment variables`) writeJSONFile(resolvePath('cypress.env.json'), { managementToken, activeSpaceId: spaceId, activeEnvironmentId: environmentId, - activeAliasId: aliasId, role, entries, }) diff --git a/test/integration/tasks/create-new-environment.ts b/test/integration/tasks/create-new-environment.ts index d1539d7720..e6fb6facd0 100644 --- a/test/integration/tasks/create-new-environment.ts +++ b/test/integration/tasks/create-new-environment.ts @@ -33,10 +33,5 @@ export default async () => { console.log(`New "${environmentId}" environment is created`) - const aliasId = nanoid() - const alias = (await space.createEnvironmentAliasWithId(aliasId, { environment })) as any - - console.log(`New "${aliasId}" alias is created`) - - return { environmentId, aliasId: alias.sys.id } + return environmentId } diff --git a/test/integration/tasks/delete-new-environment-alias.ts b/test/integration/tasks/delete-new-environment-alias.ts deleted file mode 100644 index c904e06a30..0000000000 --- a/test/integration/tasks/delete-new-environment-alias.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { getCurrentSpace } from '../contentful-client' -import { printStepTitle } from '../utils' - -export default async (aliasId: string) => { - printStepTitle('Remove previously created environment alias') - - const space = await getCurrentSpace() - - const alias = await space.getEnvironmentAlias(aliasId) - - await alias.delete() - - console.log(`"${aliasId}" alias is deleted`) - - return true -}