Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/appsmithorg/appsmith into release

Browse Source
This commit is contained in:
Automated Github Action 2020-09-18 07:06:32 +00:00
commit 20cb3c6439
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/CreateOrgTests_spec.js
View File

@ -99,13 +99,7 @@ describe("Create new org and share with a user", function() {
Cypress.env("TESTUSERNAME2"), Cypress.env("TESTUSERNAME2"),
homePage.viewerRole, homePage.viewerRole,
); );
cy.navigateToOrgSettings(orgid); cy.LogOut();
cy.get(homePage.emailList).then(function($list) {
expect($list).to.have.length(3);
expect($list.eq(0)).to.contain(Cypress.env("USERNAME"));
expect($list.eq(1)).to.contain(Cypress.env("TESTUSERNAME1"));
expect($list.eq(2)).to.contain(Cypress.env("TESTUSERNAME2"));
});
}); });
it("login as Org owner and delete App ", function() { it("login as Org owner and delete App ", function() {

9
app/client/cypress/support/commands.js
View File

@ -47,7 +47,8 @@ Cypress.Commands.add("navigateToOrgSettings", orgName => {
cy.get(homePage.orgList.concat(orgName).concat(")")) cy.get(homePage.orgList.concat(orgName).concat(")"))
.scrollIntoView() .scrollIntoView()
.should("be.visible"); .should("be.visible");
cy.get(".t--org-name a") cy.get(".t--org-name span")
.contains(orgName)
.first() .first()
.click({ force: true }); .click({ force: true });
cy.xpath(homePage.MemberSettings).click({ force: true }); cy.xpath(homePage.MemberSettings).click({ force: true });
@ -91,7 +92,8 @@ Cypress.Commands.add("deleteUserFromOrg", (orgName, email) => {
cy.get(homePage.orgList.concat(orgName).concat(")")) cy.get(homePage.orgList.concat(orgName).concat(")"))
.scrollIntoView() .scrollIntoView()
.should("be.visible"); .should("be.visible");
cy.get(".t--org-name a") cy.get(".t--org-name span")
.contains(orgName)
.first() .first()
.click({ force: true }); .click({ force: true });
cy.xpath(homePage.MemberSettings).click({ force: true }); cy.xpath(homePage.MemberSettings).click({ force: true });
@ -117,7 +119,8 @@ Cypress.Commands.add("updateUserRoleForOrg", (orgName, email, role) => {
cy.get(homePage.orgList.concat(orgName).concat(")")) cy.get(homePage.orgList.concat(orgName).concat(")"))
.scrollIntoView() .scrollIntoView()
.should("be.visible"); .should("be.visible");
cy.get(".t--org-name a") cy.get(".t--org-name span")
.contains(orgName)
.first() .first()
.click({ force: true }); .click({ force: true });
cy.xpath(homePage.MemberSettings).click({ force: true }); cy.xpath(homePage.MemberSettings).click({ force: true });