diff --git a/main/tests/cypress/cypress/integration/project_management/create_project.spec.js b/main/tests/cypress/cypress/integration/create-project/create_project.spec.js similarity index 100% rename from main/tests/cypress/cypress/integration/project_management/create_project.spec.js rename to main/tests/cypress/cypress/integration/create-project/create_project.spec.js diff --git a/main/tests/cypress/cypress/integration/extensions/wikidata/.gitkeep b/main/tests/cypress/cypress/integration/extensions/wikidata/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/main/tests/cypress/cypress/integration/project_management/import_project.spec.js b/main/tests/cypress/cypress/integration/import-project/import_project.spec.js similarity index 100% rename from main/tests/cypress/cypress/integration/project_management/import_project.spec.js rename to main/tests/cypress/cypress/integration/import-project/import_project.spec.js diff --git a/main/tests/cypress/cypress/integration/project_management/list_projects.spec.js b/main/tests/cypress/cypress/integration/open-project/list_projects.spec.js similarity index 100% rename from main/tests/cypress/cypress/integration/project_management/list_projects.spec.js rename to main/tests/cypress/cypress/integration/open-project/list_projects.spec.js diff --git a/main/tests/cypress/cypress/integration/project_management/open_project.spec.js b/main/tests/cypress/cypress/integration/open-project/open_project.spec.js similarity index 100% rename from main/tests/cypress/cypress/integration/project_management/open_project.spec.js rename to main/tests/cypress/cypress/integration/open-project/open_project.spec.js diff --git a/main/tests/cypress/cypress/integration/project/grid/all-column/.gitkeep b/main/tests/cypress/cypress/integration/project/grid/all-column/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/main/tests/cypress/cypress/integration/project/grid/column/edit-cells/.gitkeep b/main/tests/cypress/cypress/integration/project/grid/column/edit-cells/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/main/tests/cypress/cypress/integration/project/grid/column/edit-column/.gitkeep b/main/tests/cypress/cypress/integration/project/grid/column/edit-column/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/main/tests/cypress/cypress/integration/project/grid/column/facet/.gitkeep b/main/tests/cypress/cypress/integration/project/grid/column/facet/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/main/tests/cypress/cypress/integration/project/grid/column/facet/customized-facets/.gitkeep b/main/tests/cypress/cypress/integration/project/grid/column/facet/customized-facets/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/main/tests/cypress/cypress/integration/project/facets/facets.numeric.spec.js b/main/tests/cypress/cypress/integration/project/grid/column/facet/facets.numeric.spec.js similarity index 100% rename from main/tests/cypress/cypress/integration/project/facets/facets.numeric.spec.js rename to main/tests/cypress/cypress/integration/project/grid/column/facet/facets.numeric.spec.js diff --git a/main/tests/cypress/cypress/integration/project/facets/facets.spec.js b/main/tests/cypress/cypress/integration/project/grid/column/facet/facets.spec.js similarity index 100% rename from main/tests/cypress/cypress/integration/project/facets/facets.spec.js rename to main/tests/cypress/cypress/integration/project/grid/column/facet/facets.spec.js diff --git a/main/tests/cypress/cypress/integration/project/grid/column/reconcile/.gitkeep b/main/tests/cypress/cypress/integration/project/grid/column/reconcile/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/main/tests/cypress/cypress/integration/project/sorting/sorting.spec.js b/main/tests/cypress/cypress/integration/project/grid/column/sort.spec.js similarity index 57% rename from main/tests/cypress/cypress/integration/project/sorting/sorting.spec.js rename to main/tests/cypress/cypress/integration/project/grid/column/sort.spec.js index 0aa78b8d3..dde7634e3 100644 --- a/main/tests/cypress/cypress/integration/project/sorting/sorting.spec.js +++ b/main/tests/cypress/cypress/integration/project/grid/column/sort.spec.js @@ -8,8 +8,8 @@ describe(__filename, function () { cy.confirmDialogPanel(); // ensure sorting is active - cy.getCell(0, 'Shrt_Desc').contains('BUTTER,WHIPPED,WITH SALT'); - cy.getCell(1, 'Shrt_Desc').contains('BUTTER,WITH SALT'); + cy.getCell(0, 'Shrt_Desc').should('to.contain', 'BUTTER,WHIPPED,WITH SALT') + cy.getCell(1, 'Shrt_Desc').should('to.contain', 'BUTTER,WITH SALT'); }); it('Perform a basic sort + Reverse', function () { @@ -21,15 +21,15 @@ describe(__filename, function () { cy.confirmDialogPanel(); // check the sorting - cy.getCell(0, 'Shrt_Desc').contains('BUTTER,WHIPPED,WITH SALT'); - cy.getCell(1, 'Shrt_Desc').contains('BUTTER,WITH SALT'); + cy.getCell(0, 'Shrt_Desc').should('to.contain', 'BUTTER,WHIPPED,WITH SALT'); + cy.getCell(1, 'Shrt_Desc').should('to.contain', 'BUTTER,WITH SALT'); // do a reverse sort cy.columnActionClick('Shrt_Desc', ['Sort', 'Reverse']); // re-check the sorting - cy.getCell(0, 'Shrt_Desc').contains('BUTTER,WITH SALT'); - cy.getCell(1, 'Shrt_Desc').contains('BUTTER,WHIPPED,WITH SALT'); + cy.getCell(0, 'Shrt_Desc').should('to.contain', 'BUTTER,WITH SALT'); + cy.getCell(1, 'Shrt_Desc').should('to.contain', 'BUTTER,WHIPPED,WITH SALT'); }); it('Perform a basic sort + Remove Sort', function () { @@ -41,14 +41,14 @@ describe(__filename, function () { cy.confirmDialogPanel(); // check the sorting - cy.getCell(0, 'Shrt_Desc').contains('BUTTER,WHIPPED,WITH SALT'); - cy.getCell(1, 'Shrt_Desc').contains('BUTTER,WITH SALT'); + cy.getCell(0, 'Shrt_Desc').should('to.contain', 'BUTTER,WHIPPED,WITH SALT'); + cy.getCell(1, 'Shrt_Desc').should('to.contain', 'BUTTER,WITH SALT'); // remove cy.columnActionClick('Shrt_Desc', ['Sort', 'Remove sort']); // re-check the sorting - cy.getCell(0, 'Shrt_Desc').contains('BUTTER,WITH SALT'); - cy.getCell(1, 'Shrt_Desc').contains('BUTTER,WHIPPED,WITH SALT'); + cy.getCell(0, 'Shrt_Desc').should('to.contain', 'BUTTER,WITH SALT'); + cy.getCell(1, 'Shrt_Desc').should('to.contain', 'BUTTER,WHIPPED,WITH SALT'); }); }); diff --git a/main/tests/cypress/cypress/integration/project/grid/column/transpose/.gitkeep b/main/tests/cypress/cypress/integration/project/grid/column/transpose/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/main/tests/cypress/cypress/integration/project/grid/column/view/.gitkeep b/main/tests/cypress/cypress/integration/project/grid/column/view/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/main/tests/cypress/cypress/integration/project/edit/edit_cells.spec.js b/main/tests/cypress/cypress/integration/project/grid/row/edit_cells.spec.js similarity index 100% rename from main/tests/cypress/cypress/integration/project/edit/edit_cells.spec.js rename to main/tests/cypress/cypress/integration/project/grid/row/edit_cells.spec.js diff --git a/main/tests/cypress/cypress/integration/project/grid/viewpanel-header/.gitkeep b/main/tests/cypress/cypress/integration/project/grid/viewpanel-header/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/main/tests/cypress/cypress/integration/project_management/export_project.spec.js b/main/tests/cypress/cypress/integration/project/project-header/export_project.spec.js similarity index 100% rename from main/tests/cypress/cypress/integration/project_management/export_project.spec.js rename to main/tests/cypress/cypress/integration/project/project-header/export_project.spec.js