sefrone-api-e2e 1.4.0__tar.gz → 1.4.1__tar.gz

{sefrone_api_e2e-1.4.0 → sefrone_api_e2e-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sefrone_api_e2e
-Version: 1.4.0
+Version: 1.4.1
 Summary: A Python package to provide e2e testing helpers for sefrone API projects
 Home-page: https://bitbucket.org/sefrone/sefrone_pypi
 Author: Sefrone

{sefrone_api_e2e-1.4.0 → sefrone_api_e2e-1.4.1}/sefrone_api_e2e/e2e/Scenarios/Auth/1_normal_auth_flow.yaml

@@ -17,13 +17,34 @@ steps:
       body:
         response:
           token: string
+          projectId: string
     save:
       login_token: "{{body.response.token}}"
+      login_project_id: "{{body.response.projectId}}"
 
   - name: "Generate unique test suffix"
     randomize:
       seed_id: 8
 
+  - name: "Create a workspace for this flow"
+    skip_if:
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
+    method: "POST"
+    endpoint: "/api/v1/apiAuth/workspace"
+    request_headers:
+      - x-api-token: "{$stored.login_token}"
+    send_as: "json"
+    body:
+      name: "e2e_auth_ws_{$stored.seed_id}"
+      description: "E2E auth flow workspace"
+      projectId: "{$stored.login_project_id}"
+    expect:
+      status: 200
+      body:
+        errorCode: number
+        errorCodeStr: string
+        message: string
+
   - name: "Get user info"
     method: "GET"
     endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/info/{$stored.login_token}"
@@ -125,9 +146,9 @@ steps:
   - name: "Create guest account for workspace"
     skip_if:
       - "GuestAccount not in {$stored.0_check_features.enabled_features}"
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
     method: "POST"
-    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/$var(DEFAULT_WORKSPACE_NAME)/guest"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/e2e_auth_ws_{$stored.seed_id}/guest"
     expect:
       status: 200
       body:
@@ -153,14 +174,14 @@ steps:
     assertions:
       - "{{body.response.accountType}} == 'guest'"
       - "{{body.response.linkedWorkspaces.count()}} == 1"
-      - "{{body.response.linkedWorkspaces[0].workspaceName}} == '$var(DEFAULT_WORKSPACE_NAME)'"
+      - "{{body.response.linkedWorkspaces[0].workspaceName}} == 'e2e_auth_ws_{$stored.seed_id}'"
 
   - name: "Get same workspace guest account with existing token"
     skip_if:
       - "GuestAccount not in {$stored.0_check_features.enabled_features}"
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
     method: "POST"
-    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/$var(DEFAULT_WORKSPACE_NAME)/guest"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/e2e_auth_ws_{$stored.seed_id}/guest"
     request_headers:
       - x-api-token: "{$stored.workspace_guest_token}"
     expect:
@@ -186,7 +207,7 @@ steps:
       - "{{body.response.accountId}} == '{$stored.workspace_guest_account_id}'"
       - "{{body.response.token}} == '{$stored.workspace_guest_token}'"
       - "{{body.response.linkedWorkspaces.count()}} == 1"
-      - "{{body.response.linkedWorkspaces[0].workspaceName}} == '$var(DEFAULT_WORKSPACE_NAME)'"
+      - "{{body.response.linkedWorkspaces[0].workspaceName}} == 'e2e_auth_ws_{$stored.seed_id}'"
 
   - name: "Login with wrong password"
     method: "POST"

{sefrone_api_e2e-1.4.0 → sefrone_api_e2e-1.4.1}/sefrone_api_e2e/e2e/Scenarios/Auth/2_account_endpoints.yaml

@@ -1,170 +1,202 @@
-name: "Account Endpoints Flow"
-base_url: "http://localhost:$var(API_PUBLIC_PORT)"
-steps:
-  - name: "Login admin user"
-    retry:
-      attempts: 10
-      delay_seconds: 5
-    method: "POST"
-    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/login"
-    send_as: "json"
-    body:
-      device: "e2e_test_device"
-      pseudo: "$var(DEFAULT_USERNAME)"
-      password: "$var(DEFAULT_PASSWORD)"
-    expect:
-      status: 200
-      body:
-        response:
-          token: string
-    save:
-      admin_token: "{{body.response.token}}"
-
-  - name: "Generate unique test suffix"
-    randomize:
-      guest_seed_account_id: 8
-
-  - name: "Create account by workspace"
-    skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
-    method: "POST"
-    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/$var(DEFAULT_WORKSPACE_NAME)/create?accountType=standard"
-    request_headers:
-      - x-api-token: "{$stored.admin_token}"
-    send_as: "json"
-    body:
-      username: "e2e_account_{$stored.guest_seed_account_id}"
-      password: "e2e_account_pwd_v1"
-    expect:
-      status: 200
-      body:
-        errorCode: number
-        errorCodeStr: string
-        message: string
-        response:
-          accountId: string
-          projectId: string
-          project: string
-          accountType: string
-          isActive: boolean
-          username: string
-          linkedWorkspaces:
-            - workspaceId: string
-              workspaceName: string
-              workspaceDescription: string
-    save:
-      managed_account_id: "{{body.response.accountId}}"
-      managed_account_username: "{{body.response.username}}"
-    assertions:
-      - "{{body.response.accountType}} == 'standard'"
-      - "{{body.response.isActive}} == True"
-      - "{{body.response.linkedWorkspaces.count()}} == 1"
-      - "{{body.response.linkedWorkspaces[0].workspaceName}} == '$var(DEFAULT_WORKSPACE_NAME)'"
-
-  - name: "Get created account permissions"
-    skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
-    method: "GET"
-    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/permission/{$stored.managed_account_id}"
-    request_headers:
-      - x-api-token: "{$stored.admin_token}"
-    expect:
-      status: 200
-      body:
-        errorCode: number
-        errorCodeStr: string
-        message: string
-        response:
-          accountId: string
-          projectId: string
-    assertions:
-      - "{{body.response.accountId}} == '{$stored.managed_account_id}'"
-
-  - name: "Update created account by workspace"
-    skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
-    method: "POST"
-    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/$var(DEFAULT_WORKSPACE_NAME)/update/{$stored.managed_account_id}"
-    request_headers:
-      - x-api-token: "{$stored.admin_token}"
-    send_as: "json"
-    body:
-      username: "e2e_updated_{$stored.guest_seed_account_id}"
-    expect:
-      status: 200
-      body:
-        errorCode: number
-        errorCodeStr: string
-        message: string
-
-  - name: "Set created account credentials by workspace"
-    skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
-    method: "POST"
-    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/$var(DEFAULT_WORKSPACE_NAME)/credentials/{$stored.managed_account_id}"
-    request_headers:
-      - x-api-token: "{$stored.admin_token}"
-    send_as: "json"
-    body:
-      password: "e2e_account_pwd_v2"
-    expect:
-      status: 200
-      body:
-        errorCode: number
-        errorCodeStr: string
-        message: string
-
-  - name: "Login updated account with new credentials"
-    skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
-    method: "POST"
-    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/login"
-    send_as: "json"
-    body:
-      device: "e2e_test_device"
-      pseudo: "e2e_updated_{$stored.guest_seed_account_id}"
-      password: "e2e_account_pwd_v2"
-    expect:
-      status: 200
-      body:
-        errorCode: number
-        errorCodeStr: string
-        message: string
-        response:
-          accountId: string
-          token: string
-    save:
-      managed_account_token: "{{body.response.token}}"
-    assertions:
-      - "{{body.response.accountId}} == '{$stored.managed_account_id}'"
-
-  - name: "Delete created account by workspace"
-    skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
-    method: "DELETE"
-    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/$var(DEFAULT_WORKSPACE_NAME)/delete/{$stored.managed_account_id}"
-    request_headers:
-      - x-api-token: "{$stored.admin_token}"
-    expect:
-      status: 200
-      body:
-        errorCode: number
-        errorCodeStr: string
-        message: string
-
-  - name: "Login should fail for deleted account"
-    skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
-    method: "POST"
-    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/login"
-    send_as: "json"
-    body:
-      device: "e2e_test_device"
-      pseudo: "e2e_updated_{$stored.guest_seed_account_id}"
-      password: "e2e_account_pwd_v2"
-    expect:
-      status: 401
-      body:
-        errorCode: number
-        errorCodeStr: string
-        message: string
+name: "Account Endpoints Flow"
+skip_if:
+  - "Workspaces not in {$stored.0_check_features.enabled_features}"
+base_url: "http://localhost:$var(API_PUBLIC_PORT)"
+steps:
+  - name: "Login admin user"
+    retry:
+      attempts: 10
+      delay_seconds: 5
+    method: "POST"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/login"
+    send_as: "json"
+    body:
+      device: "e2e_test_device"
+      pseudo: "$var(DEFAULT_USERNAME)"
+      password: "$var(DEFAULT_PASSWORD)"
+    expect:
+      status: 200
+      body:
+        response:
+          token: string
+          projectId: string
+    save:
+      admin_token: "{{body.response.token}}"
+      admin_project_id: "{{body.response.projectId}}"
+
+  - name: "Generate unique test suffix"
+    randomize:
+      guest_seed_account_id: 8
+
+  - name: "Create a workspace for this flow"
+    method: "POST"
+    endpoint: "/api/v1/apiAuth/workspace"
+    request_headers:
+      - x-api-token: "{$stored.admin_token}"
+    send_as: "json"
+    body:
+      name: "e2e_account_ws_{$stored.guest_seed_account_id}"
+      description: "E2E account endpoints workspace"
+      projectId: "{$stored.admin_project_id}"
+    expect:
+      status: 200
+      body:
+        errorCode: number
+        errorCodeStr: string
+        message: string
+
+  - name: "Get created workspace id"
+    method: "GET"
+    endpoint: "/api/v1/apiAuth/workspace/$var(AUTH_PROJECT_NAME)/e2e_account_ws_{$stored.guest_seed_account_id}"
+    request_headers:
+      - x-api-token: "{$stored.admin_token}"
+    expect:
+      status: 200
+      body:
+        response:
+          id: string
+    save:
+      flow_workspace_id: "{{body.response.id}}"
+
+  - name: "Create account by workspace"
+    method: "POST"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/e2e_account_ws_{$stored.guest_seed_account_id}/create?accountType=standard"
+    request_headers:
+      - x-api-token: "{$stored.admin_token}"
+    send_as: "json"
+    body:
+      username: "e2e_account_{$stored.guest_seed_account_id}"
+      password: "e2e_account_pwd_v1"
+    expect:
+      status: 200
+      body:
+        errorCode: number
+        errorCodeStr: string
+        message: string
+        response:
+          accountId: string
+          projectId: string
+          project: string
+          accountType: string
+          isActive: boolean
+          username: string
+          linkedWorkspaces:
+            - workspaceId: string
+              workspaceName: string
+              workspaceDescription: string
+    save:
+      managed_account_id: "{{body.response.accountId}}"
+      managed_account_username: "{{body.response.username}}"
+    assertions:
+      - "{{body.response.accountType}} == 'standard'"
+      - "{{body.response.isActive}} == True"
+      - "{{body.response.linkedWorkspaces.count()}} == 1"
+      - "{{body.response.linkedWorkspaces[0].workspaceName}} == 'e2e_account_ws_{$stored.guest_seed_account_id}'"
+
+  - name: "Get created account permissions"
+    method: "GET"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/permission/{$stored.managed_account_id}"
+    request_headers:
+      - x-api-token: "{$stored.admin_token}"
+    expect:
+      status: 200
+      body:
+        errorCode: number
+        errorCodeStr: string
+        message: string
+        response:
+          accountId: string
+          projectId: string
+    assertions:
+      - "{{body.response.accountId}} == '{$stored.managed_account_id}'"
+
+  - name: "Update created account by workspace"
+    method: "POST"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/e2e_account_ws_{$stored.guest_seed_account_id}/update/{$stored.managed_account_id}"
+    request_headers:
+      - x-api-token: "{$stored.admin_token}"
+    send_as: "json"
+    body:
+      username: "e2e_updated_{$stored.guest_seed_account_id}"
+    expect:
+      status: 200
+      body:
+        errorCode: number
+        errorCodeStr: string
+        message: string
+
+  - name: "Set created account credentials by workspace"
+    method: "POST"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/e2e_account_ws_{$stored.guest_seed_account_id}/credentials/{$stored.managed_account_id}"
+    request_headers:
+      - x-api-token: "{$stored.admin_token}"
+    send_as: "json"
+    body:
+      password: "e2e_account_pwd_v2"
+    expect:
+      status: 200
+      body:
+        errorCode: number
+        errorCodeStr: string
+        message: string
+
+  - name: "Login updated account with new credentials"
+    method: "POST"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/login"
+    send_as: "json"
+    body:
+      device: "e2e_test_device"
+      pseudo: "e2e_updated_{$stored.guest_seed_account_id}"
+      password: "e2e_account_pwd_v2"
+    expect:
+      status: 200
+      body:
+        errorCode: number
+        errorCodeStr: string
+        message: string
+        response:
+          accountId: string
+          token: string
+    save:
+      managed_account_token: "{{body.response.token}}"
+    assertions:
+      - "{{body.response.accountId}} == '{$stored.managed_account_id}'"
+
+  - name: "Delete created account by workspace"
+    method: "DELETE"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/e2e_account_ws_{$stored.guest_seed_account_id}/delete/{$stored.managed_account_id}"
+    request_headers:
+      - x-api-token: "{$stored.admin_token}"
+    expect:
+      status: 200
+      body:
+        errorCode: number
+        errorCodeStr: string
+        message: string
+
+  - name: "Login should fail for deleted account"
+    method: "POST"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/login"
+    send_as: "json"
+    body:
+      device: "e2e_test_device"
+      pseudo: "e2e_updated_{$stored.guest_seed_account_id}"
+      password: "e2e_account_pwd_v2"
+    expect:
+      status: 401
+      body:
+        errorCode: number
+        errorCodeStr: string
+        message: string
+
+  - name: "Cleanup: Delete the workspace created for this flow"
+    method: "DELETE"
+    endpoint: "/api/v1/apiAuth/workspace/{$stored.flow_workspace_id}"
+    request_headers:
+      - x-api-token: "{$stored.admin_token}"
+    expect:
+      status: 200
+      body:
+        errorCode: number
+        errorCodeStr: string
+        message: string

{sefrone_api_e2e-1.4.0 → sefrone_api_e2e-1.4.1}/sefrone_api_e2e/e2e/Scenarios/Auth/3_admin_account_endpoints.yaml

@@ -19,9 +19,11 @@ steps:
           accountId: string
           accountType: string
           token: string
+          projectId: string
     save:
       root_admin_token: "{{body.response.token}}"
       root_admin_account_id: "{{body.response.accountId}}"
+      root_admin_project_id: "{{body.response.projectId}}"
     assertions:
       - "{{body.response.accountType}} == 'root'"
 
@@ -154,11 +156,45 @@ steps:
         errorCodeStr: string
         message: string
 
+  - name: "Create a workspace for this flow"
+    skip_if:
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
+    method: "POST"
+    endpoint: "/api/v1/apiAuth/workspace"
+    request_headers:
+      - x-api-token: "{$stored.root_admin_token}"
+    send_as: "json"
+    body:
+      name: "e2e_admin_ws_{$stored.seed_account_id}"
+      description: "E2E admin account endpoints workspace"
+      projectId: "{$stored.root_admin_project_id}"
+    expect:
+      status: 200
+      body:
+        errorCode: number
+        errorCodeStr: string
+        message: string
+
+  - name: "Get created workspace id"
+    skip_if:
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
+    method: "GET"
+    endpoint: "/api/v1/apiAuth/workspace/$var(AUTH_PROJECT_NAME)/e2e_admin_ws_{$stored.seed_account_id}"
+    request_headers:
+      - x-api-token: "{$stored.root_admin_token}"
+    expect:
+      status: 200
+      body:
+        response:
+          id: string
+    save:
+      flow_workspace_id: "{{body.response.id}}"
+
   - name: "Root add workspace link"
     skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
     method: "POST"
-    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/$var(DEFAULT_WORKSPACE_NAME)/link/{$stored.admin_managed_account_id}"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/e2e_admin_ws_{$stored.seed_account_id}/link/{$stored.admin_managed_account_id}"
     request_headers:
       - x-api-token: "{$stored.root_admin_token}"
     expect:
@@ -170,9 +206,9 @@ steps:
 
   - name: "Root remove workspace link"
     skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
     method: "DELETE"
-    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/$var(DEFAULT_WORKSPACE_NAME)/link/{$stored.admin_managed_account_id}"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/e2e_admin_ws_{$stored.seed_account_id}/link/{$stored.admin_managed_account_id}"
     request_headers:
       - x-api-token: "{$stored.root_admin_token}"
     expect:
@@ -635,3 +671,17 @@ steps:
         errorCode: number
         errorCodeStr: string
         message: string
+
+  - name: "Cleanup: Delete the workspace created for this flow"
+    skip_if:
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
+    method: "DELETE"
+    endpoint: "/api/v1/apiAuth/workspace/{$stored.flow_workspace_id}"
+    request_headers:
+      - x-api-token: "{$stored.root_admin_token}"
+    expect:
+      status: 200
+      body:
+        errorCode: number
+        errorCodeStr: string
+        message: string

{sefrone_api_e2e-1.4.0 → sefrone_api_e2e-1.4.1}/sefrone_api_e2e/e2e/Scenarios/Auth/4_workspace_endpoints.yaml

@@ -220,7 +220,7 @@ steps:
 
   - name: "Standard account cannot get workspace without projects permission"
     method: "GET"
-    endpoint: "/api/v1/apiAuth/workspace/$var(AUTH_PROJECT_NAME)/$var(DEFAULT_WORKSPACE_NAME)"
+    endpoint: "/api/v1/apiAuth/workspace/$var(AUTH_PROJECT_NAME)/e2e_workspace_updated_{$stored.seed_account_id}"
     request_headers:
       - x-api-token: "{$stored.std_token}"
     expect:

{sefrone_api_e2e-1.4.0 → sefrone_api_e2e-1.4.1}/sefrone_api_e2e/e2e/Scenarios/Auth/5_apikey_endpoints.yaml

@@ -19,18 +19,88 @@ steps:
       body:
         response:
           token: string
+          accountId: string
+          projectId: string
     save:
       admin_token: "{{body.response.token}}"
+      admin_account_id: "{{body.response.accountId}}"
+      admin_project_id: "{{body.response.projectId}}"
 
   - name: "Generate unique test suffix"
     randomize:
       seed_account_id: 8
 
+  - name: "Create a workspace for this flow"
+    skip_if:
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
+    method: "POST"
+    endpoint: "/api/v1/apiAuth/workspace"
+    request_headers:
+      - x-api-token: "{$stored.admin_token}"
+    send_as: "json"
+    body:
+      name: "e2e_apikey_ws_{$stored.seed_account_id}"
+      description: "E2E API key endpoints workspace"
+      projectId: "{$stored.admin_project_id}"
+    expect:
+      status: 200
+      body:
+        errorCode: number
+        errorCodeStr: string
+        message: string
+
+  - name: "Get created workspace id"
+    skip_if:
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
+    method: "GET"
+    endpoint: "/api/v1/apiAuth/workspace/$var(AUTH_PROJECT_NAME)/e2e_apikey_ws_{$stored.seed_account_id}"
+    request_headers:
+      - x-api-token: "{$stored.admin_token}"
+    expect:
+      status: 200
+      body:
+        response:
+          id: string
+    save:
+      flow_workspace_id: "{{body.response.id}}"
+
+  # Creating workspace-scoped resources is allowed for root regardless of workspace links, but
+  # listing them (ValidateWorkspaceLink) is not - root must actually be linked to the workspace it
+  # just created, and the existing admin_token's cached metadata won't reflect a link added after
+  # the fact, so a fresh login is required to pick it up.
+  - name: "Link admin account to the created workspace"
+    skip_if:
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
+    method: "POST"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/e2e_apikey_ws_{$stored.seed_account_id}/link/{$stored.admin_account_id}"
+    request_headers:
+      - x-api-token: "{$stored.admin_token}"
+    expect:
+      status: 200
+
+  - name: "Re-login root admin to refresh workspace metadata"
+    skip_if:
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
+    method: "POST"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/login"
+    send_as: "json"
+    body:
+      device: "e2e_test_device"
+      pseudo: "$var(DEFAULT_USERNAME)"
+      password: "$var(DEFAULT_PASSWORD)"
+    expect:
+      status: 200
+      body:
+        response:
+          token: string
+    save:
+      admin_token: "{{body.response.token}}"
+
   - name: "Create API key at workspace level"
     skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
     method: "POST"
-    endpoint: "/api/v1/apiAuth/apiKey/$var(AUTH_PROJECT_NAME)/workspace/$var(DEFAULT_WORKSPACE_NAME)/create"
+    endpoint: "/api/v1/apiAuth/apiKey/$var(AUTH_PROJECT_NAME)/workspace/e2e_apikey_ws_{$stored.seed_account_id}/create"
     request_headers:
       - x-api-token: "{$stored.admin_token}"
     send_as: "json"
@@ -59,9 +129,9 @@ steps:
 
   - name: "List API keys by workspace"
     skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
     method: "GET"
-    endpoint: "/api/v1/apiAuth/apiKey/$var(AUTH_PROJECT_NAME)/workspace/$var(DEFAULT_WORKSPACE_NAME)/list?begin=0&count=10"
+    endpoint: "/api/v1/apiAuth/apiKey/$var(AUTH_PROJECT_NAME)/workspace/e2e_apikey_ws_{$stored.seed_account_id}/list?begin=0&count=10"
     request_headers:
       - x-api-token: "{$stored.admin_token}"
     expect:
@@ -84,7 +154,7 @@ steps:
 
   - name: "Get API key details"
     skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
     method: "GET"
     endpoint: "/api/v1/apiAuth/apiKey/$var(AUTH_PROJECT_NAME)/info/{$stored.ws_apikey_value}"
     request_headers:
@@ -200,9 +270,9 @@ steps:
 
   - name: "Limited admin cannot list API keys without PermApiKeys"
     skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
     method: "GET"
-    endpoint: "/api/v1/apiAuth/apiKey/$var(AUTH_PROJECT_NAME)/workspace/$var(DEFAULT_WORKSPACE_NAME)/list?begin=0&count=10"
+    endpoint: "/api/v1/apiAuth/apiKey/$var(AUTH_PROJECT_NAME)/workspace/e2e_apikey_ws_{$stored.seed_account_id}/list?begin=0&count=10"
     request_headers:
       - x-api-token: "{$stored.limited_admin_token}"
     expect:
@@ -210,9 +280,9 @@ steps:
 
   - name: "Limited admin cannot create API key without PermApiKeys"
     skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
     method: "POST"
-    endpoint: "/api/v1/apiAuth/apiKey/$var(AUTH_PROJECT_NAME)/workspace/$var(DEFAULT_WORKSPACE_NAME)/create"
+    endpoint: "/api/v1/apiAuth/apiKey/$var(AUTH_PROJECT_NAME)/workspace/e2e_apikey_ws_{$stored.seed_account_id}/create"
     request_headers:
       - x-api-token: "{$stored.limited_admin_token}"
     send_as: "json"
@@ -223,7 +293,7 @@ steps:
 
   - name: "Limited admin cannot get API key info without PermApiKeys"
     skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
     method: "GET"
     endpoint: "/api/v1/apiAuth/apiKey/$var(AUTH_PROJECT_NAME)/info/{$stored.ws_apikey_value}"
     request_headers:
@@ -268,9 +338,9 @@ steps:
 
   - name: "link limited admin to test workspace"
     skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
     method: "POST"
-    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/$var(DEFAULT_WORKSPACE_NAME)/link/{$stored.limited_admin_id}"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/e2e_apikey_ws_{$stored.seed_account_id}/link/{$stored.limited_admin_id}"
     request_headers:
       - x-api-token: "{$stored.admin_token}"
     expect:
@@ -294,9 +364,9 @@ steps:
 
   - name: "Limited admin can list API keys by workspace with PermApiKeys"
     skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
     method: "GET"
-    endpoint: "/api/v1/apiAuth/apiKey/$var(AUTH_PROJECT_NAME)/workspace/$var(DEFAULT_WORKSPACE_NAME)/list?begin=0&count=10"
+    endpoint: "/api/v1/apiAuth/apiKey/$var(AUTH_PROJECT_NAME)/workspace/e2e_apikey_ws_{$stored.seed_account_id}/list?begin=0&count=10"
     request_headers:
       - x-api-token: "{$stored.limited_admin_token}"
     expect:
@@ -354,7 +424,7 @@ steps:
 
   - name: "Cleanup: Delete workspace API key account"
     skip_if:
-      - "'$var(DEFAULT_WORKSPACE_NAME)' == ''"
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
     method: "DELETE"
     endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/delete/{$stored.ws_apikey_account_id}"
     request_headers:
@@ -377,3 +447,23 @@ steps:
       - x-api-token: "{$stored.admin_token}"
     expect:
       status: 200
+
+  - name: "Cleanup: Unlink admin account from the workspace created for this flow"
+    skip_if:
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
+    method: "DELETE"
+    endpoint: "/api/v1/apiAuth/account/$var(AUTH_PROJECT_NAME)/workspace/e2e_apikey_ws_{$stored.seed_account_id}/link/{$stored.admin_account_id}"
+    request_headers:
+      - x-api-token: "{$stored.admin_token}"
+    expect:
+      status: 200
+
+  - name: "Cleanup: Delete the workspace created for this flow"
+    skip_if:
+      - "Workspaces not in {$stored.0_check_features.enabled_features}"
+    method: "DELETE"
+    endpoint: "/api/v1/apiAuth/workspace/{$stored.flow_workspace_id}"
+    request_headers:
+      - x-api-token: "{$stored.admin_token}"
+    expect:
+      status: 200

{sefrone_api_e2e-1.4.0 → sefrone_api_e2e-1.4.1}/sefrone_api_e2e.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sefrone_api_e2e
-Version: 1.4.0
+Version: 1.4.1
 Summary: A Python package to provide e2e testing helpers for sefrone API projects
 Home-page: https://bitbucket.org/sefrone/sefrone_pypi
 Author: Sefrone

{sefrone_api_e2e-1.4.0 → sefrone_api_e2e-1.4.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="sefrone_api_e2e",
-    version="1.4.0",
+    version="1.4.1",
     author="Sefrone",
     author_email="contact@sefrone.com",
     description="A Python package to provide e2e testing helpers for sefrone API projects",