clone/nocodb
1
0
Fork 0
mirror of https://github.com/nocodb/nocodb.git synced 2026-04-29 16:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feat/kanban-view

Browse Source
This commit is contained in:
Wing-Kam Wong
2022-09-26 17:05:30 +08:00
parent 59c777d30e 8f26c28bb3
commit 6c9948d818
61 changed files with 820 additions and 645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
scripts/cypress/support/page_objects/mainPage.js
View File

@@ -119,18 +119,22 @@ export class _mainPage {
);
// click on New User button, feed details
cy.get("button.nc-invite-team").click();
cy.getActiveModal(".nc-modal-settings")
.find("button.nc-invite-team")
.click();
// additional wait to ensure the modal is fully loaded
cy.getActiveModal(".nc-modal-invite-user-and-share-base").should("exist");
cy.getActiveModal(".nc-modal-invite-user-and-share-base")
.find('input[placeholder="E-mail"]')
.should("exist");
cy.wait(1000);
cy.get('input[placeholder="E-mail"]').type(userCred.username);
cy.get(".ant-select.nc-user-roles").click();
cy.getActiveModal(".nc-modal-invite-user-and-share-base")
.find('input[placeholder="E-mail"]')
.type(userCred.username);
cy.getActiveModal(".nc-modal-invite-user-and-share-base")
.find(".ant-select.nc-user-roles")
.click();
// opt-in requested role & submit
// cy.getActiveSelection().contains(roleType).click({force: true});
@@ -256,13 +260,18 @@ export class _mainPage {
.trigger("mouseover", { force: true })
.click({ force: true });
cy.wait(500);
// cy.get(".nc-column-delete").click();
cy.getActiveMenu(".nc-dropdown-column-operations")
.find(".nc-column-delete")
.click();
cy.get(".nc-column-delete").click();
cy.wait(500);
cy.get(".nc-column-delete").should("not.be.visible");
cy.get(".ant-btn-dangerous:visible").contains("Delete").click();
cy.wait(500);
// cy.get(".nc-column-delete").should("not.be.visible");
// cy.get(".ant-btn-dangerous:visible").contains("Delete").click();
cy.getActiveModal(".nc-modal-column-delete")
.find(".ant-btn-dangerous:visible")
.contains("Delete")
.click();
cy.get(`th:contains(${colName})`).should("not.exist");
};
@@ -549,9 +558,7 @@ export class _mainPage {
.find(".nc-project-menu-item")
.contains("Download")
.click();
cy.wait(1000);
cy.get(".nc-project-menu-item")
.contains("Download as CSV")
cy.get(".nc-project-menu-item:contains('Download as CSV')")
.should("exist")
.click();
}
@@ -624,9 +631,13 @@ export class _mainPage {
}
metaSyncValidate(tbl, msg) {
// http://localhost:8080/api/v1/db/meta/projects/p_bxp57hmks0n5o2/meta-diff
cy.intercept("GET", "/api/v1/db/meta/projects/**").as("metaSync");
cy.get(".nc-btn-metasync-reload").should("exist").click();
cy.wait(2000);
cy.get(`.nc-metasync-row-${tbl}`).contains(msg).should("exist");
cy.wait("@metaSync");
cy.get(`.nc-metasync-row-${tbl}:contains(${msg})`).should("exist");
cy.get(".nc-btn-metasync-sync-now")
.should("exist")
.click()

13
scripts/cypress/support/page_objects/navigation.js
View File

@@ -78,11 +78,8 @@ export class _loginPage {
// projectsPage.openProject(staticProjects.pgExternalREST.basic.name);
// }
//
// // kludge: wait for page load to finish
// cy.wait(2000);
// // close team & auth tab
// cy.get('button.ant-tabs-tab-remove').should('exist').click();
// cy.wait(1000);
}
}
@@ -108,13 +105,11 @@ export class _projectsPage {
projectsPage.openProject(staticProjects.pgExternalREST.basic.name);
}
// kludge: wait for page load to finish
// cy.wait(4000);
cy.wait("@waitForPageLoad");
// close team & auth tab
cy.get("button.ant-tabs-tab-remove").should("exist").click();
cy.wait(1000);
cy.get("button.ant-tabs-tab-remove").should("not.exist");
}
// Open existing project
@@ -155,6 +150,8 @@ export class _projectsPage {
cy.get(".nc-metadb-project-name").should("exist");
cy.contains("button", "Create").should("exist");
// fix me! wait till the modal rendering (input highlight) is completed
// focus shifts back to the input field to select text after the dropdown is rendered
cy.wait(1000);
// feed project name
@@ -185,7 +182,8 @@ export class _projectsPage {
cy.get(".nc-extdb-proj-name").should("exist");
cy.get(".nc-extdb-btn-test-connection").should("exist");
// CY goes too fast at times, so wait for the page to load
// fix me! wait till the modal rendering (input highlight) is completed
// focus shifts back to the input field to select text after the dropdown is rendered
cy.wait(1000);
cy.get(".nc-extdb-proj-name").clear().type(projectName);
@@ -208,7 +206,6 @@ export class _projectsPage {
// Create project
cy.contains("Ok & Save Project", { timeout: 20000 }).click();
cy.wait(5000);
// takes a while to load project
this.waitHomePageLoad();