Restructure stores for e2e tests

tests/e2e/cucumber/environment/index.ts

@@ -15,7 +15,7 @@ import { config } from '../../config'
 import { api, environment } from '../../support'
 import { World } from './world'
 import { state } from './shared'
-import { spaceStore, linkStore } from '../../support/store'
+import { createdSpaceStore, createdLinkStore } from '../../support/store'
 import { User } from '../../support/types'
 
 export { World }
@@ -110,7 +110,7 @@ After(async function (this: World, { result }: ITestCaseHookParameter) {
 
   await cleanUpSpaces(this.usersEnvironment.getUser({ key: 'admin' }))
 
-  linkStore.clear()
+  createdLinkStore.clear()
 })
 
 AfterAll(() => state.browser && state.browser.close())
@@ -119,7 +119,7 @@ setWorldConstructor(World)
 
 const cleanUpSpaces = async (adminUser: User) => {
   const requests = []
-  spaceStore.forEach((space) => {
+  createdSpaceStore.forEach((space) => {
     requests.push(
       api.graph
         .disableSpace({
@@ -137,5 +137,5 @@ const cleanUpSpaces = async (adminUser: User) => {
     )
   })
   await Promise.all(requests)
-  spaceStore.clear()
+  createdSpaceStore.clear()
 }

tests/e2e/cucumber/steps/ui/public.ts

@@ -5,7 +5,7 @@ import { DateTime } from 'luxon'
 import { World } from '../../environment'
 import { objects } from '../../../support'
 import { processDelete, processDownload } from './resources'
-import { linkStore } from '../../../support/store'
+import { createdLinkStore } from '../../../support/store'
 
 When(
   '{string} opens the public link {string}',
@@ -145,7 +145,7 @@ When(
 Then(
   '{string} should not be able to open the old link {string}',
   function (this: World, stepUser: string, name: string): void {
-    expect(linkStore.has(name)).toBe(false)
+    expect(createdLinkStore.has(name)).toBe(false)
   }
 )
 

tests/e2e/support/environment/link.ts

@@ -1,33 +1,33 @@
 import { Link } from '../types'
-import { linkStore } from '../store'
+import { createdLinkStore } from '../store'
 
 export class LinksEnvironment {
   getLink({ name }: { name: string }): Link {
-    if (!linkStore.has(name)) {
+    if (!createdLinkStore.has(name)) {
       throw new Error(`link with name '${name}' not found`)
     }
-    return linkStore.get(name)
+    return createdLinkStore.get(name)
   }
 
   updateLinkName({ key, link }: { key: string; link: Link }): any {
-    if (!linkStore.has(key)) {
+    if (!createdLinkStore.has(key)) {
       throw new Error(`link with name '${key}' not found`)
     }
-    linkStore.set(link.name, link)
-    linkStore.delete(key)
+    createdLinkStore.set(link.name, link)
+    createdLinkStore.delete(key)
   }
 
   createLink({ key, link }: { key: string; link: Link }): Link {
-    if (linkStore.has(key)) {
+    if (createdLinkStore.has(key)) {
       throw new Error(`link with key '${key}' already exists`)
     }
-    linkStore.set(key, link)
+    createdLinkStore.set(key, link)
     return link
   }
 
   deleteLink({ key }: { key: string }): boolean {
-    if (linkStore.has(key)) {
-      return linkStore.delete(key)
+    if (createdLinkStore.has(key)) {
+      return createdLinkStore.delete(key)
     }
     throw new Error(`link with key '${key}' doesn't exist`)
   }

tests/e2e/support/environment/space.ts

@@ -1,21 +1,21 @@
 import { Space } from '../types'
-import { spaceStore } from '../store'
+import { createdSpaceStore } from '../store'
 
 export class SpacesEnvironment {
   getSpace({ key }: { key: string }): Space {
-    if (!spaceStore.has(key)) {
+    if (!createdSpaceStore.has(key)) {
       throw new Error(`space with key '${key}' not found`)
     }
 
-    return spaceStore.get(key)
+    return createdSpaceStore.get(key)
   }
 
   createSpace({ key, space }: { key: string; space: Space }): Space {
-    if (spaceStore.has(key)) {
+    if (createdSpaceStore.has(key)) {
       throw new Error(`link with key '${key}' already exists`)
     }
 
-    spaceStore.set(key, space)
+    createdSpaceStore.set(key, space)
 
     return space
   }

tests/e2e/support/environment/userManagement.ts

@@ -1,47 +1,47 @@
 import { Group, User } from '../types'
-import { userStore, groupStore } from '../store'
+import { dummyUserStore, dummyGroupStore } from '../store'
 
 export class UsersEnvironment {
   getUser({ key }: { key: string }): User {
     const uniqueKey = key.toLowerCase()
 
-    if (!userStore.has(uniqueKey)) {
+    if (!dummyUserStore.has(uniqueKey)) {
       throw new Error(`user with key '${uniqueKey}' not found`)
     }
 
-    return userStore.get(uniqueKey)
+    return dummyUserStore.get(uniqueKey)
   }
 
   createUser({ key, user }: { key: string; user: User }): User {
     const uniqueKey = key.toLowerCase()
 
-    if (userStore.has(uniqueKey)) {
+    if (dummyUserStore.has(uniqueKey)) {
       throw new Error(`user with key '${uniqueKey}' already exists`)
     }
 
-    userStore.set(uniqueKey, user)
+    dummyUserStore.set(uniqueKey, user)
 
     return user
   }
 
   getGroup({ key }: { key: string }): Group {
     const uniqueKey = key.toLowerCase()
 
-    if (!groupStore.has(uniqueKey)) {
+    if (!dummyGroupStore.has(uniqueKey)) {
       throw new Error(`group with key '${uniqueKey}' not found`)
     }
 
-    return groupStore.get(uniqueKey)
+    return dummyGroupStore.get(uniqueKey)
   }
 
   createGroup({ key, group }: { key: string; group: Group }): Group {
     const uniqueKey = key.toLowerCase()
 
-    if (userStore.has(uniqueKey)) {
+    if (dummyUserStore.has(uniqueKey)) {
       throw new Error(`group with key '${uniqueKey}' already exists`)
     }
 
-    groupStore.set(uniqueKey, group)
+    dummyGroupStore.set(uniqueKey, group)
 
     return group
   }

tests/e2e/support/objects/app-files/share/actions.ts

@@ -5,7 +5,7 @@ import { sidebar } from '../utils'
 import { clickResource } from '../resource/actions'
 import { copyLinkArgs, waitForPopupNotPresent } from '../link/actions'
 import { config } from '../../../../config.js'
-import { linkStore } from '../../../store'
+import { createdLinkStore } from '../../../store'
 
 const filesSharedWithMeAccepted =
   '#files-shared-with-me-accepted-section [data-test-resource-name="%s"]'
@@ -215,8 +215,8 @@ export const copyQuickLink = async (args: copyLinkArgs): Promise<string> => {
 
   await waitForPopupNotPresent(page)
 
-  if (url && !linkStore.has(linkName)) {
-    linkStore.set(linkName, { name: linkName, url })
+  if (url && !createdLinkStore.has(linkName)) {
+    createdLinkStore.set(linkName, { name: linkName, url })
   }
   return url
 }

tests/e2e/support/store/group.ts

@@ -1,6 +1,6 @@
 import { Group } from '../types'
 
-export const groupStore = new Map<string, Group>([
+export const dummyGroupStore = new Map<string, Group>([
   [
     'security',
     {
@@ -23,3 +23,5 @@ export const groupStore = new Map<string, Group>([
     }
   ]
 ])
+
+export const createdGroupStore = new Map<string, Group>()

tests/e2e/support/store/index.ts

@@ -1,6 +1,6 @@
 export { actorStore } from './actor'
-export { linkStore } from './link'
-export { spaceStore } from './space'
-export { userStore } from './user'
-export { groupStore } from './group'
+export { createdLinkStore } from './link'
+export { createdSpaceStore } from './space'
+export { dummyUserStore } from './user'
+export { dummyGroupStore } from './group'
 export { userRoleStore } from './role'

tests/e2e/support/store/link.ts

@@ -1,3 +1,3 @@
 import { Link } from '../types'
 
-export const linkStore = new Map<string, Link>()
+export const createdLinkStore = new Map<string, Link>()

tests/e2e/support/store/space.ts

@@ -1,3 +1,3 @@
 import { Space } from '../types'
 
-export const spaceStore = new Map<string, Space>()
+export const createdSpaceStore = new Map<string, Space>()

tests/e2e/support/store/user.ts

@@ -1,6 +1,6 @@
 import { User } from '../types'
 
-export const userStore = new Map<string, User>([
+export const dummyUserStore = new Map<string, User>([
   [
     'admin',
     {
@@ -65,3 +65,5 @@ export const userStore = new Map<string, User>([
     }
   ]
 ])
+
+export const createdUserStore = new Map<string, User>()