use add instead of update

Signed-off-by: tygao <[email protected]>
opensearch-project · Nov 12, 2024 · 5bf332c · 5bf332c
1 parent 906009a
commit 5bf332c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 81 deletions.
diff --git a/...rch-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_collaborators.spec.js b/...rch-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_collaborators.spec.js
@@ -22,8 +22,20 @@ if (
         features: ['use-case-observability'],
         settings: {
           permissions: {
-            library_write: { users: ['%me%'] },
-            write: { users: ['%me%'] },
+            library_write: {
+              users: [`${Cypress.env('username')}`],
+              groups: ['admin_group'],
+            },
+            write: {
+              users: [`${Cypress.env('username')}`],
+              groups: ['admin_group'],
+            },
+            library_read: {
+              users: ['read_user'],
+            },
+            read: {
+              users: ['read_user'],
+            },
           },
         },
       }).then((value) => {
@@ -32,7 +44,7 @@ if (
       });
     });
 
-    after(() => {
+    afterEach(() => {
       cy.deleteWorkspaceById(workspaceId);
     });
 
@@ -41,7 +53,9 @@ if (
       cy.getElementByTestId('add-collaborator-popover').click();
       cy.get('button[id="user"]').click();
       cy.contains('Add Users').should('be.visible');
-      cy.getElementByTestId('workspaceCollaboratorIdInput-0').type('read_user');
+      cy.getElementByTestId('workspaceCollaboratorIdInput-0').type(
+        'new_read_user'
+      );
       cy.get('button[type="submit"]')
         .contains('span', 'Add collaborators')
         .click();
@@ -51,7 +65,7 @@ if (
       cy.get('button[id="group"]').click();
       cy.contains('Add Groups').should('be.visible');
       cy.getElementByTestId('workspaceCollaboratorIdInput-0').type(
-        'admin_group'
+        'new_admin_group'
       );
       cy.get('span[title="Admin"]').click();
       cy.get('button[type="submit"]')
@@ -61,14 +75,14 @@ if (
       cy.wait(2000); // Intentional Wait
 
       cy.get('table')
-        .contains('td', 'read_user')
+        .contains('td', 'new_read_user')
         .parent()
         .within(() => {
           cy.get('td').eq(3).contains('Read only');
         });
 
       cy.get('table')
-        .contains('td', 'admin_group')
+        .contains('td', 'new_admin_group')
         .parent()
         .within(() => {
           cy.get('td').eq(3).contains('Admin');
@@ -80,49 +94,24 @@ if (
         permissions: {
           library_write: {
             users: [`${Cypress.env('username')}`],
-            groups: ['admin_group'],
+            groups: ['admin_group', 'new_admin_group'],
           },
           write: {
             users: [`${Cypress.env('username')}`],
-            groups: ['admin_group'],
+            groups: ['admin_group', 'new_admin_group'],
           },
           library_read: {
-            users: ['read_user'],
+            users: ['read_user', 'new_read_user'],
           },
           read: {
-            users: ['read_user'],
+            users: ['read_user', 'new_read_user'],
           },
         },
       };
       cy.checkWorkspace(workspaceId, expectedWorkspace);
     });
 
     it('should change access level successfully', () => {
-      //Add initial collaborators
-      cy.updateWorkspace({
-        id: workspaceId,
-        settings: {
-          permissions: {
-            library_write: {
-              users: [`${Cypress.env('username')}`],
-              groups: ['admin_group'],
-            },
-            write: {
-              users: [`${Cypress.env('username')}`],
-              groups: ['admin_group'],
-            },
-            library_read: {
-              users: ['read_user'],
-            },
-            read: {
-              users: ['read_user'],
-            },
-          },
-        },
-      });
-      miscUtils.visitPage(`w/${workspaceId}/app/workspace_collaborators`);
-      cy.wait(2000); // Intentional Wait
-
       cy.get('table')
         .contains('td', 'read_user')
         .parent('tr')
@@ -185,31 +174,6 @@ if (
     });
 
     it('should delete collaborators successfully', () => {
-      //Add initial collaborators
-      cy.updateWorkspace({
-        id: workspaceId,
-        settings: {
-          permissions: {
-            library_write: {
-              users: [`${Cypress.env('username')}`],
-              groups: ['admin_group'],
-            },
-            write: {
-              users: [`${Cypress.env('username')}`],
-              groups: ['admin_group'],
-            },
-            library_read: {
-              users: ['read_user'],
-            },
-            read: {
-              users: ['read_user'],
-            },
-          },
-        },
-      });
-      miscUtils.visitPage(`w/${workspaceId}/app/workspace_collaborators`);
-      cy.wait(2000); // Intentional Wait
-
       cy.get('table')
         .contains('td', 'read_user')
         .parent('tr')

diff --git a/cypress/utils/dashboards/workspace-plugin/commands.js b/cypress/utils/dashboards/workspace-plugin/commands.js
@@ -65,26 +65,6 @@ Cypress.Commands.add('createWorkspace', ({ settings, ...workspace } = {}) => {
   });
 });
 
-Cypress.Commands.add('updateWorkspace', ({ settings, attributes, id } = {}) => {
-  cy.request({
-    method: 'PUT',
-    url: `${BASE_PATH}${WORKSPACE_API_PREFIX}/${id}`,
-    headers: {
-      'osd-xsrf': true,
-    },
-    body: {
-      attributes,
-      settings,
-    },
-  }).then((resp) => {
-    if (resp && resp.body && resp.body.success) {
-      return resp.body.result.id;
-    } else {
-      throw new Error(`Update workspace failed!`);
-    }
-  });
-});
-
 /**
  * Check whether the given workspace is equal to the expected workspace or not,
  * the given workspace is as exepcted when the name, description, features, and permissions are as expected.