From 9313584da29ab95cfbcee89e1f3ac79bdd40e67f Mon Sep 17 00:00:00 2001 From: Ankita Kinger Date: Sat, 24 Dec 2022 00:26:25 +0530 Subject: [PATCH] chore: Updating DS version and adding test for search on members page (#19189) ## Description > Updating DS version and adding a test for search on the members page. Updating the DS version to fix the issue on GAC where two tabs show active in a scenario where current tab changes are not saved by the user and he tries to switch the tab. Fixes [#19088](https://github.com/appsmithorg/appsmith/issues/19088) ## Type of change - Adding new test & updating DS version ## How Has This Been Tested? > Ran the new test locally and it passed. DS change has been tested with the alpha version on EE. - Manual - Cypress ## Checklist: ### Dev activity - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag ### QA activity: - [ ] Test plan has been approved by relevant developers - [ ] Test plan has been peer reviewed by QA - [ ] Cypress test cases have been added and approved by either SDET or manual QA - [ ] Organized project review call with relevant stakeholders after Round 1/2 of QA - [ ] Added Test Plan Approved label after reveiwing all Cypress test --- .../Workspace/MemberRoles_Spec.ts | 33 ++++++++++++++----- app/client/package.json | 2 +- app/client/yarn.lock | 8 ++--- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Workspace/MemberRoles_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Workspace/MemberRoles_Spec.ts index 5867dc4d84..1b6bcdd53f 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Workspace/MemberRoles_Spec.ts +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Workspace/MemberRoles_Spec.ts @@ -31,7 +31,23 @@ describe("Create new workspace and invite user & validate all roles", () => { homePage.LogOutviaAPI(); }); - it("2. Login as Invited user and validate Viewer role", function() { + it("2. Login as Administrator and search for users using search bar", () => { + homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD")); + homePage.FilterApplication(appid, workspaceId); + cy.xpath("//span[text()='Share']/parent::button").click(); + cy.xpath(homePage._visibleTextSpan("MANAGE USERS")).click({ + force: true, + }); + cy.get(".search-highlight").should("not.exist"); + cy.get("[data-testid=t--search-input").type(Cypress.env("TESTUSERNAME1"), { + delay: 300, + }); + cy.get(".search-highlight").should("exist"); + cy.get(".search-highlight").contains(Cypress.env("TESTUSERNAME1")); + homePage.LogOutviaAPI(); + }); + + it("3. Login as Invited user and validate Viewer role", function() { homePage.LogintoApp( Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"), @@ -58,7 +74,7 @@ describe("Create new workspace and invite user & validate all roles", () => { homePage.LogOutviaAPI(); }); - it("3. Login as Workspace owner and Update the Invited user role to Developer", function() { + it("4. Login as Workspace owner and Update the Invited user role to Developer", function() { homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD")); homePage.FilterApplication(appid, workspaceId); homePage.UpdateUserRoleInWorkspace( @@ -70,7 +86,7 @@ describe("Create new workspace and invite user & validate all roles", () => { homePage.LogOutviaAPI(); }); - it("4. Login as Invited user and validate Developer role", function() { + it("5. Login as Invited user and validate Developer role", function() { homePage.LogintoApp( Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"), @@ -96,7 +112,7 @@ describe("Create new workspace and invite user & validate all roles", () => { homePage.LogOutviaAPI(); }); - it("5. Login as Workspace owner and Update the Invited user role to Administrator", function() { + it("6. Login as Workspace owner and Update the Invited user role to Administrator", function() { homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD")); homePage.FilterApplication(appid, workspaceId); homePage.UpdateUserRoleInWorkspace( @@ -108,7 +124,7 @@ describe("Create new workspace and invite user & validate all roles", () => { homePage.LogOutviaAPI(); }); - it("6. Login as Invited user and validate Administrator role", function() { + it("7. Login as Invited user and validate Administrator role", function() { homePage.LogintoApp( Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"), @@ -142,7 +158,7 @@ describe("Create new workspace and invite user & validate all roles", () => { homePage.LogOutviaAPI(); }); - it("7. Login as Workspace owner and verify all 3 users are present", function() { + it("8. Login as Workspace owner and verify all 3 users are present", function() { homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD")); homePage.FilterApplication(appid, workspaceId); homePage.UpdateUserRoleInWorkspace( @@ -162,7 +178,7 @@ describe("Create new workspace and invite user & validate all roles", () => { homePage.NavigateToHome(); }); - it("8. Login as Developer, Verify leave workspace flow", () => { + it("9. Login as Developer, Verify leave workspace flow", () => { homePage.LogintoApp( Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"), @@ -171,7 +187,8 @@ describe("Create new workspace and invite user & validate all roles", () => { homePage.leaveWorkspace(workspaceId); homePage.LogOutviaAPI(); }); - it("9. Login as App Viewer, Verify leave workspace flow", () => { + + it("10. Login as App Viewer, Verify leave workspace flow", () => { homePage.LogintoApp( Cypress.env("TESTUSERNAME2"), Cypress.env("TESTPASSWORD2"), diff --git a/app/client/package.json b/app/client/package.json index d499c0504a..9558fd66c5 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -46,7 +46,7 @@ "cypress-log-to-output": "^1.1.2", "dayjs": "^1.10.6", "deep-diff": "^1.0.2", - "design-system": "npm:@appsmithorg/design-system@1.0.39", + "design-system": "npm:@appsmithorg/design-system@1.0.41", "downloadjs": "^1.4.7", "draft-js": "^0.11.7", "exceljs-lightweight": "^1.14.0", diff --git a/app/client/yarn.lock b/app/client/yarn.lock index 1ccb6759bd..e1f5672630 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -6202,10 +6202,10 @@ depd@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" -"design-system@npm:@appsmithorg/design-system@1.0.39": - version "1.0.39" - resolved "https://registry.yarnpkg.com/@appsmithorg/design-system/-/design-system-1.0.39.tgz#8f735ddca6768d647bb6187c8754e07b98a56f1b" - integrity sha512-ronzjAJyR1nc0Amya1jD1vsyrWKf+iSgOSg9mfRLfWBO52gn6fOStEAs9h+7FS8qvlXnww1MDGWfeK69pIXYRQ== +"design-system@npm:@appsmithorg/design-system@1.0.41": + version "1.0.41" + resolved "https://registry.yarnpkg.com/@appsmithorg/design-system/-/design-system-1.0.41.tgz#983f4ca2f99825842f80fd2b47cbaa14e67ea5c0" + integrity sha512-p99nx2N3pHHDioEH46vlmCyKmQXv3gGh3NGHlqbj3J2XTxReQypkQXcLxrgHC9/9LWvu5jU7ZLedoblSdIghgw== dependencies: emoji-mart "3.0.1"