Revert: "chore: test that SDK respects alias (#710)" (#717)

This reverts commit b86ee28.
contentful · May 18, 2021 · 4ab6e48 · 4ab6e48
1 parent c23185a
commit 4ab6e48
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 98 deletions.
diff --git a/test/cypress/integration/entry-editor-aliased.spec.ts b/test/cypress/integration/entry-editor-aliased.spec.ts
diff --git 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
@@ -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
@@ -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
@@ -6,21 +6,18 @@ export async function createCypressConfiguration({
   environmentId,
   role,
   entries,
-  aliasId,
 }: {
   managementToken: string
   spaceId: string
   environmentId: string
   role: string
   entries: Record<string, string>
-  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
@@ -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