From 20a64215a01329d4433c5ac5c2617ed26bbfa740 Mon Sep 17 00:00:00 2001 From: Raju Udava Date: Tue, 21 Sep 2021 09:34:22 +0530 Subject: [PATCH] test: [cypress] test order corrections (file rename) Signed-off-by: Raju Udava --- ...igurations.js => 00_pre_configurations.js} | 0 ...tions_spec.js => 0a_project_operations.js} | 0 ...rations_spec.js => 1a_table_operations.js} | 3 -- ..._spec.js => 1b_table_column_operations.js} | 2 +- ...ons_spec.js => 1c_table_row_operations.js} | 0 ...js => 2a_table_with_belongs_to_colulmn.js} | 2 +- ...2m_spec.js => 2b_table_with_m2m_column.js} | 2 +- ...js => 3a_filter_sort_fields_operations.js} | 34 +++++++++---------- ...formula_column.js => 3b_formula_column.js} | 0 .../{lookup_column.js => 3c_lookup_column.js} | 0 .../{rollup_column.js => 3d_rollup_column.js} | 0 ..._spec.js => 4a_table_view_grid_gallery.js} | 0 .../{share_view.js => 4b_table_view_share.js} | 0 .../{user_role_spec.js => 5a_user_role.js} | 0 ...review_role_spec.js => 5b_preview_role.js} | 0 .../common/{audit.js => 6a_audit.js} | 0 16 files changed, 20 insertions(+), 23 deletions(-) rename cypress/integration/common/{_pre_configurations.js => 00_pre_configurations.js} (100%) rename cypress/integration/common/{project_operations_spec.js => 0a_project_operations.js} (100%) rename cypress/integration/common/{table_operations_spec.js => 1a_table_operations.js} (99%) rename cypress/integration/common/{table_column_operations_spec.js => 1b_table_column_operations.js} (99%) rename cypress/integration/common/{table_row_operations_spec.js => 1c_table_row_operations.js} (100%) rename cypress/integration/common/{open_existing_table_spec.js => 2a_table_with_belongs_to_colulmn.js} (99%) rename cypress/integration/common/{open_existing_table_with_m2m_spec.js => 2b_table_with_m2m_column.js} (99%) rename cypress/integration/common/{filter_sort_fields_operations_spec.js => 3a_filter_sort_fields_operations.js} (85%) rename cypress/integration/common/{formula_column.js => 3b_formula_column.js} (100%) rename cypress/integration/common/{lookup_column.js => 3c_lookup_column.js} (100%) rename cypress/integration/common/{rollup_column.js => 3d_rollup_column.js} (100%) rename cypress/integration/common/{table_view_spec.js => 4a_table_view_grid_gallery.js} (100%) rename cypress/integration/common/{share_view.js => 4b_table_view_share.js} (100%) rename cypress/integration/common/{user_role_spec.js => 5a_user_role.js} (100%) rename cypress/integration/common/{preview_role_spec.js => 5b_preview_role.js} (100%) rename cypress/integration/common/{audit.js => 6a_audit.js} (100%) diff --git a/cypress/integration/common/_pre_configurations.js b/cypress/integration/common/00_pre_configurations.js similarity index 100% rename from cypress/integration/common/_pre_configurations.js rename to cypress/integration/common/00_pre_configurations.js diff --git a/cypress/integration/common/project_operations_spec.js b/cypress/integration/common/0a_project_operations.js similarity index 100% rename from cypress/integration/common/project_operations_spec.js rename to cypress/integration/common/0a_project_operations.js diff --git a/cypress/integration/common/table_operations_spec.js b/cypress/integration/common/1a_table_operations.js similarity index 99% rename from cypress/integration/common/table_operations_spec.js rename to cypress/integration/common/1a_table_operations.js index ef67483375..472a38b1ee 100644 --- a/cypress/integration/common/table_operations_spec.js +++ b/cypress/integration/common/1a_table_operations.js @@ -49,11 +49,8 @@ const genTest = (type, meta) => { .first().click() cy.get('.nc-project-tree').contains(name, {timeout: 6000}).first().click({force: true}); - cy.get(`.project-tab:contains(${name}):visible`).should('exist') - cy.get('.nc-table-delete-btn:visible').click() - cy.get('button:contains(Submit)').click() cy.get(`.project-tab:contains(${name}):visible`).first().should('not.exist') }); diff --git a/cypress/integration/common/table_column_operations_spec.js b/cypress/integration/common/1b_table_column_operations.js similarity index 99% rename from cypress/integration/common/table_column_operations_spec.js rename to cypress/integration/common/1b_table_column_operations.js index 4780265c2f..434ead571b 100644 --- a/cypress/integration/common/table_column_operations_spec.js +++ b/cypress/integration/common/1b_table_column_operations.js @@ -82,7 +82,7 @@ const genTest = (type) => { cy.get(`th:contains(${updatedColName})`).should('not.exist'); }) - }) + }) } genTest('rest') diff --git a/cypress/integration/common/table_row_operations_spec.js b/cypress/integration/common/1c_table_row_operations.js similarity index 100% rename from cypress/integration/common/table_row_operations_spec.js rename to cypress/integration/common/1c_table_row_operations.js diff --git a/cypress/integration/common/open_existing_table_spec.js b/cypress/integration/common/2a_table_with_belongs_to_colulmn.js similarity index 99% rename from cypress/integration/common/open_existing_table_spec.js rename to cypress/integration/common/2a_table_with_belongs_to_colulmn.js index 6f03b54271..ffcc178cd4 100644 --- a/cypress/integration/common/open_existing_table_spec.js +++ b/cypress/integration/common/2a_table_with_belongs_to_colulmn.js @@ -5,7 +5,7 @@ const genTest = (type) => { describe(`${type.toUpperCase()} api - Existing table`, () => { before(() => loginPage.loginAndOpenProject(type)) - + it('Table column header, URL validation', () => { cy.openTableTab('Country') diff --git a/cypress/integration/common/open_existing_table_with_m2m_spec.js b/cypress/integration/common/2b_table_with_m2m_column.js similarity index 99% rename from cypress/integration/common/open_existing_table_with_m2m_spec.js rename to cypress/integration/common/2b_table_with_m2m_column.js index 0e48717111..1d14043f83 100644 --- a/cypress/integration/common/open_existing_table_with_m2m_spec.js +++ b/cypress/integration/common/2b_table_with_m2m_column.js @@ -8,7 +8,7 @@ const genTest = (type) => { loginPage.loginAndOpenProject(type) cy.openTableTab('Actor') }) - + it('Table column header, URL validation', () => { // column name validation diff --git a/cypress/integration/common/filter_sort_fields_operations_spec.js b/cypress/integration/common/3a_filter_sort_fields_operations.js similarity index 85% rename from cypress/integration/common/filter_sort_fields_operations_spec.js rename to cypress/integration/common/3a_filter_sort_fields_operations.js index f3b12053e9..20bcea1a35 100644 --- a/cypress/integration/common/filter_sort_fields_operations_spec.js +++ b/cypress/integration/common/3a_filter_sort_fields_operations.js @@ -4,7 +4,7 @@ import { loginPage } from "../../support/page_objects/navigation" const genTest = (type) => { - describe(`${type.toUpperCase()} api - Filter, Fields, Sort`, () => { + describe(`${type.toUpperCase()} api - Filter, Fields, Sort`, () => { before(() => { loginPage.loginAndOpenProject(type) @@ -15,8 +15,8 @@ const genTest = (type) => { }) describe(`Pagination`, () => { - // check pagination - it('Check country table - Pagination', () => { + // check pagination + it('Check country table - Pagination', () => { cy.get('.nc-pagination').should('exist') // verify > pagination option @@ -36,14 +36,14 @@ const genTest = (type) => { it('Add row using tool header button', () => { // add a row to end of Country table - cy.get('.nc-add-new-row-btn').click(); - cy.get('#data-table-form-Country > input').first().type('Test Country'); - cy.contains('Save Row').filter('button').click() + cy.get('.nc-add-new-row-btn').click(); + cy.get('#data-table-form-Country > input').first().type('Test Country'); + cy.contains('Save Row').filter('button').click() // verify mainPage.getPagination(5).click() mainPage.getCell("Country", 10).contains("Test Country").should('exist') - }) + }) // delete slingle row // @@ -94,21 +94,21 @@ const genTest = (type) => { describe(`Sort operations`, () => { it('Enable sort', () => { // Sort menu operations (Country Column, Z->A) - cy.get('.nc-sort-menu-btn').click() - cy.contains('Add Sort Option').click(); - cy.get('.nc-sort-field-select div').first().click() - cy.get('.menuable__content__active .v-list-item:contains(Country)').click() - cy.get('.nc-sort-dir-select div').first().click() - cy.get('.menuable__content__active .v-list-item:contains("Z -> A")').click() + cy.get('.nc-sort-menu-btn').click() + cy.contains('Add Sort Option').click(); + cy.get('.nc-sort-field-select div').first().click() + cy.get('.menuable__content__active .v-list-item:contains(Country)').click() + cy.get('.nc-sort-dir-select div').first().click() + cy.get('.menuable__content__active .v-list-item:contains("Z -> A")').click() - cy.contains('Zambia').should('exist') + cy.contains('Zambia').should('exist') }) it('Disable sort', () => { // remove sort and validate - cy.get('.nc-sort-item-remove-btn').click() - cy.contains('Zambia').should('not.exist') - }) + cy.get('.nc-sort-item-remove-btn').click() + cy.contains('Zambia').should('not.exist') + }) }) diff --git a/cypress/integration/common/formula_column.js b/cypress/integration/common/3b_formula_column.js similarity index 100% rename from cypress/integration/common/formula_column.js rename to cypress/integration/common/3b_formula_column.js diff --git a/cypress/integration/common/lookup_column.js b/cypress/integration/common/3c_lookup_column.js similarity index 100% rename from cypress/integration/common/lookup_column.js rename to cypress/integration/common/3c_lookup_column.js diff --git a/cypress/integration/common/rollup_column.js b/cypress/integration/common/3d_rollup_column.js similarity index 100% rename from cypress/integration/common/rollup_column.js rename to cypress/integration/common/3d_rollup_column.js diff --git a/cypress/integration/common/table_view_spec.js b/cypress/integration/common/4a_table_view_grid_gallery.js similarity index 100% rename from cypress/integration/common/table_view_spec.js rename to cypress/integration/common/4a_table_view_grid_gallery.js diff --git a/cypress/integration/common/share_view.js b/cypress/integration/common/4b_table_view_share.js similarity index 100% rename from cypress/integration/common/share_view.js rename to cypress/integration/common/4b_table_view_share.js diff --git a/cypress/integration/common/user_role_spec.js b/cypress/integration/common/5a_user_role.js similarity index 100% rename from cypress/integration/common/user_role_spec.js rename to cypress/integration/common/5a_user_role.js diff --git a/cypress/integration/common/preview_role_spec.js b/cypress/integration/common/5b_preview_role.js similarity index 100% rename from cypress/integration/common/preview_role_spec.js rename to cypress/integration/common/5b_preview_role.js diff --git a/cypress/integration/common/audit.js b/cypress/integration/common/6a_audit.js similarity index 100% rename from cypress/integration/common/audit.js rename to cypress/integration/common/6a_audit.js