diff --git a/scripts/cypress/integration/common/1d_pg_table_view_drag_drop_reorder.js b/scripts/cypress/integration/common/1d_pg_table_view_drag_drop_reorder.js index 3675cf331f..76d2ff1538 100644 --- a/scripts/cypress/integration/common/1d_pg_table_view_drag_drop_reorder.js +++ b/scripts/cypress/integration/common/1d_pg_table_view_drag_drop_reorder.js @@ -38,19 +38,19 @@ export const genTest = (apiType, dbType) => { validateTreeField(7, "Actor"); - // move ActorInfo (View) field up to first place (drag, drop) - cy.get(".nc-child-draggable-icon-ActorInfo").drag( - ".nc-child-draggable-icon-Address" - ); + // // move ActorInfo (View) field up to first place (drag, drop) + // cy.get(".nc-child-draggable-icon-ActorInfo").drag( + // ".nc-child-draggable-icon-Address" + // ); - validateTreeField(1, "ActorInfo"); - validateTreeField(2, "Address"); - validateTreeField(8, "Actor"); + // validateTreeField(1, "ActorInfo"); + // validateTreeField(2, "Address"); + // validateTreeField(8, "Actor"); - // restore ActorInfo field (drag, drop) - cy.get(".nc-child-draggable-icon-ActorInfo").drag( - ".nc-child-draggable-icon-Staff" - ); + // // restore ActorInfo field (drag, drop) + // cy.get(".nc-child-draggable-icon-ActorInfo").drag( + // ".nc-child-draggable-icon-Staff" + // ); // restore Actor field (drag, drop) cy.get(".nc-child-draggable-icon-Actor").drag( @@ -59,15 +59,6 @@ export const genTest = (apiType, dbType) => { validateTreeField(1, "Actor"); validateTreeField(2, "Address"); - if (isPostgres()) { - validateTreeField(17, "Staff"); - validateTreeField(18, "ActorInfo"); - validateTreeField(19, "CustomerList"); - } else { - validateTreeField(12, "Staff"); - validateTreeField(13, "ActorInfo"); - validateTreeField(14, "CustomerList"); - } // undo project-tree expand operation cy.get(".nc-project-tree") diff --git a/scripts/cypress/integration/test/gqlMisc.js b/scripts/cypress/integration/test/gqlMisc.js index 0961193c40..363ac55deb 100644 --- a/scripts/cypress/integration/test/gqlMisc.js +++ b/scripts/cypress/integration/test/gqlMisc.js @@ -7,7 +7,7 @@ let t6e = require("../common/6e_project_operations"); let t6f = require("../common/6f_attachments"); let t6g = require("../common/6g_base_share"); const { - setCurrentMode, + setCurrentMode, } = require("../../support/page_objects/projectConstants"); // use 0 as mode to execute individual files (debug mode, skip pre-configs) @@ -15,20 +15,21 @@ const { const executionMode = 1; const nocoTestSuite = (apiType, dbType) => { - setCurrentMode(apiType, dbType); - if (0 == executionMode) { - t0.genTest(apiType, dbType); - } else { - t01.genTest(apiType, dbType); - } + setCurrentMode(apiType, dbType); + if (0 == executionMode) { + t0.genTest(apiType, dbType); + } else { + t01.genTest(apiType, dbType); + } - t6b.genTest(apiType, dbType); - t6c.genTest(apiType, dbType); - t6d.genTest(apiType, dbType); - t6f.genTest(apiType, dbType); - t6g.genTest(apiType, dbType); - // **deletes created project, hence place it @ end - t6e.genTest(apiType, dbType); + t6b.genTest(apiType, dbType); + t6c.genTest(apiType, dbType); + // language validation kept common under REST MISC Suite + // t6d.genTest(apiType, dbType); + t6f.genTest(apiType, dbType); + t6g.genTest(apiType, dbType); + // **deletes created project, hence place it @ end + t6e.genTest(apiType, dbType); }; nocoTestSuite("graphql", "mysql"); diff --git a/scripts/cypress/integration/test/masterSuiteGql.js b/scripts/cypress/integration/test/masterSuiteGql.js deleted file mode 100644 index 2fb4fe76a3..0000000000 --- a/scripts/cypress/integration/test/masterSuiteGql.js +++ /dev/null @@ -1,83 +0,0 @@ -let t0 = require("./explicitLogin"); -let t00 = require("../common/00_pre_configurations"); -let t1a = require("../common/1a_table_operations"); -let t1b = require("../common/1b_table_column_operations"); -let t1c = require("../common/1c_table_row_operations"); -let t2a = require("../common/2a_table_with_belongs_to_colulmn"); -let t2b = require("../common/2b_table_with_m2m_column"); -let t3a = require("../common/3a_filter_sort_fields_operations"); -let t3b = require("../common/3b_formula_column"); -let t3c = require("../common/3c_lookup_column"); -let t3d = require("../common/3d_rollup_column"); -let t4a = require("../common/4a_table_view_grid_gallery_form"); -let t4b = require("../common/4b_table_view_share"); -let t4c = require("../common/4c_form_view_detailed"); -let t4d = require("../common/4d_table_view_grid_locked"); -let t4e = require("../common/4e_form_view_share"); -let t4f = require("../common/4f_grid_view_share"); -let t5a = require("../common/5a_user_role"); -let t5b = require("../common/5b_preview_role"); -// merged with t1a: let t6a = require('../common/6a_audit') -let t6c = require("../common/6c_swagger_api"); -let t6d = require("../common/6d_language_validation"); -let t6e = require("../common/6e_project_operations"); - -// use 0 as mode to execute individual files (debug mode, skip pre-configs) -// use 1 mode if noco.db doesnt contain user credentials (full run over GIT) -const executionMode = 1; - -const nocoTestSuite = (apiType, dbType) => { - if (0 == executionMode) { - t0.genTest(apiType, dbType); - } else { - t00.genTest(apiType, dbType); - } - - t1a.genTest(apiType, dbType); - t1b.genTest(apiType, dbType); - // merged with t1b: t1c.genTest(apiType, dbType) - t2a.genTest(apiType, dbType); - t2b.genTest(apiType, dbType); - t3a.genTest(apiType, dbType); - t3b.genTest(apiType, dbType); - t3c.genTest(apiType, dbType); - t3d.genTest(apiType, dbType); - t4a.genTest(apiType, dbType); - t4b.genTest(apiType, dbType); - t4c.genTest(apiType, dbType); - t4d.genTest(apiType, dbType); - t4e.genTest(apiType, dbType); - t4f.genTest(apiType, dbType); - t5a.genTest(apiType, dbType); - t5b.genTest(apiType, dbType); - // merged with t1a: t6a.genTest(apiType, dbType) - t6c.genTest(apiType, dbType); - t6d.genTest(apiType, dbType); - // **deletes created project, hence place it @ end - t6e.genTest(apiType, dbType); -}; - -// nocoTestSuite('rest', "mysql") -nocoTestSuite("graphql", "mysql"); - -/** - * @copyright Copyright (c) 2021, Xgene Cloud Ltd - * - * @author Raju Udava - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ diff --git a/scripts/cypress/integration/test/masterSuiteRest.js b/scripts/cypress/integration/test/masterSuiteRest.js deleted file mode 100644 index 7f7cf1e013..0000000000 --- a/scripts/cypress/integration/test/masterSuiteRest.js +++ /dev/null @@ -1,83 +0,0 @@ -let t0 = require("./explicitLogin"); -let t00 = require("../common/00_pre_configurations"); -let t1a = require("../common/1a_table_operations"); -let t1b = require("../common/1b_table_column_operations"); -let t1c = require("../common/1c_table_row_operations"); -let t2a = require("../common/2a_table_with_belongs_to_colulmn"); -let t2b = require("../common/2b_table_with_m2m_column"); -let t3a = require("../common/3a_filter_sort_fields_operations"); -let t3b = require("../common/3b_formula_column"); -let t3c = require("../common/3c_lookup_column"); -let t3d = require("../common/3d_rollup_column"); -let t4a = require("../common/4a_table_view_grid_gallery_form"); -let t4b = require("../common/4b_table_view_share"); -let t4c = require("../common/4c_form_view_detailed"); -let t4d = require("../common/4d_table_view_grid_locked"); -let t4e = require("../common/4e_form_view_share"); -let t4f = require("../common/4f_grid_view_share"); -let t5a = require("../common/5a_user_role"); -let t5b = require("../common/5b_preview_role"); -// merged with t1a: let t6a = require('../common/6a_audit') -let t6c = require("../common/6c_swagger_api"); -let t6d = require("../common/6d_language_validation"); -let t6e = require("../common/6e_project_operations"); - -// use 0 as mode to execute individual files (debug mode, skip pre-configs) -// use 1 mode if noco.db doesnt contain user credentials (full run over GIT) -const executionMode = 1; - -const nocoTestSuite = (apiType, dbType) => { - if (0 == executionMode) { - t0.genTest(apiType, dbType); - } else { - t00.genTest(apiType, dbType); - } - - t1a.genTest(apiType, dbType); - t1b.genTest(apiType, dbType); - // merged with t1b: t1c.genTest(apiType, dbType) - t2a.genTest(apiType, dbType); - t2b.genTest(apiType, dbType); - t3a.genTest(apiType, dbType); - t3b.genTest(apiType, dbType); - t3c.genTest(apiType, dbType); - t3d.genTest(apiType, dbType); - t4a.genTest(apiType, dbType); - t4b.genTest(apiType, dbType); - t4c.genTest(apiType, dbType); - t4d.genTest(apiType, dbType); - t4e.genTest(apiType, dbType); - t4f.genTest(apiType, dbType); - t5a.genTest(apiType, dbType); - t5b.genTest(apiType, dbType); - // merged with t1a: t6a.genTest(apiType, dbType) - t6c.genTest(apiType, dbType); - t6d.genTest(apiType, dbType); - // **deletes created project, hence place it @ end - t6e.genTest(apiType, dbType); -}; - -nocoTestSuite("rest", "mysql"); -// nocoTestSuite('graphql', "mysql") - -/** - * @copyright Copyright (c) 2021, Xgene Cloud Ltd - * - * @author Raju Udava - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ diff --git a/scripts/cypress/integration/test/pg-restMisc.js b/scripts/cypress/integration/test/pg-restMisc.js index 103c99da4d..732517f1f8 100644 --- a/scripts/cypress/integration/test/pg-restMisc.js +++ b/scripts/cypress/integration/test/pg-restMisc.js @@ -24,7 +24,8 @@ const nocoTestSuite = (apiType, dbType) => { } t6b.genTest(apiType, dbType); - t6d.genTest(apiType, dbType); + // language validation kept common under REST MISC Suite + // t6d.genTest(apiType, dbType); t6c.genTest(apiType, dbType); t6f.genTest(apiType, dbType); t6g.genTest(apiType, dbType); diff --git a/scripts/cypress/integration/test/restMisc.js b/scripts/cypress/integration/test/restMisc.js index b5558f125e..8d17e65935 100644 --- a/scripts/cypress/integration/test/restMisc.js +++ b/scripts/cypress/integration/test/restMisc.js @@ -8,7 +8,7 @@ let t6f = require("../common/6f_attachments"); let t6g = require("../common/6g_base_share"); let t7a = require("../common/7a_create_project_from_excel"); const { - setCurrentMode, + setCurrentMode, } = require("../../support/page_objects/projectConstants"); // use 0 as mode to execute individual files (debug mode, skip pre-configs) @@ -16,24 +16,24 @@ const { const executionMode = 1; const nocoTestSuite = (apiType, dbType) => { - setCurrentMode(apiType, dbType); - if (0 == executionMode) { - t0.genTest(apiType, dbType); - } else { - t01.genTest(apiType, dbType); - } + setCurrentMode(apiType, dbType); + if (0 == executionMode) { + t0.genTest(apiType, dbType); + } else { + t01.genTest(apiType, dbType); + } - t6b.genTest(apiType, dbType); - t6d.genTest(apiType, dbType); - t6c.genTest(apiType, dbType); - t6f.genTest(apiType, dbType); - t6g.genTest(apiType, dbType); - // **deletes created project, hence place it @ end - t6e.genTest(apiType, dbType); + t6b.genTest(apiType, dbType); + t6d.genTest(apiType, dbType); + t6c.genTest(apiType, dbType); + t6f.genTest(apiType, dbType); + t6g.genTest(apiType, dbType); + // **deletes created project, hence place it @ end + t6e.genTest(apiType, dbType); - // intended to keep this after earlier project deletion - // creates project using excel & deletes it - t7a.genTest(apiType, dbType); + // intended to keep this after earlier project deletion + // creates project using excel & deletes it + t7a.genTest(apiType, dbType); }; nocoTestSuite("rest", "mysql"); diff --git a/scripts/cypress/integration/test/xcdb-gqlMisc.js b/scripts/cypress/integration/test/xcdb-gqlMisc.js index 49b6d8f962..56b2a69b60 100644 --- a/scripts/cypress/integration/test/xcdb-gqlMisc.js +++ b/scripts/cypress/integration/test/xcdb-gqlMisc.js @@ -7,7 +7,7 @@ let t6e = require("../common/6e_project_operations"); let t6f = require("../common/6f_attachments"); let t6g = require("../common/6g_base_share"); const { - setCurrentMode, + setCurrentMode, } = require("../../support/page_objects/projectConstants"); // use 0 as mode to execute individual files (debug mode, skip pre-configs) @@ -15,20 +15,21 @@ const { const executionMode = 1; const nocoTestSuite = (apiType, dbType) => { - setCurrentMode(apiType, dbType); - if (0 == executionMode) { - t0.genTest(apiType, dbType); - } else { - t01.genTest(apiType, dbType); - } + setCurrentMode(apiType, dbType); + if (0 == executionMode) { + t0.genTest(apiType, dbType); + } else { + t01.genTest(apiType, dbType); + } - t6b.genTest(apiType, dbType); - t6c.genTest(apiType, dbType); - t6d.genTest(apiType, dbType); - t6f.genTest(apiType, dbType); - t6g.genTest(apiType, dbType); - // **deletes created project, hence place it @ end - t6e.genTest(apiType, dbType); + t6b.genTest(apiType, dbType); + t6c.genTest(apiType, dbType); + // language validation kept common under REST MISC Suite + // t6d.genTest(apiType, dbType); + t6f.genTest(apiType, dbType); + t6g.genTest(apiType, dbType); + // **deletes created project, hence place it @ end + t6e.genTest(apiType, dbType); }; nocoTestSuite("graphql", "xcdb"); diff --git a/scripts/cypress/integration/test/xcdb-restMisc.js b/scripts/cypress/integration/test/xcdb-restMisc.js index 02f39ab058..6bf2c0a8e5 100644 --- a/scripts/cypress/integration/test/xcdb-restMisc.js +++ b/scripts/cypress/integration/test/xcdb-restMisc.js @@ -8,7 +8,7 @@ let t6f = require("../common/6f_attachments"); let t6g = require("../common/6g_base_share"); let t7a = require("../common/7a_create_project_from_excel"); const { - setCurrentMode, + setCurrentMode, } = require("../../support/page_objects/projectConstants"); // use 0 as mode to execute individual files (debug mode, skip pre-configs) @@ -16,24 +16,25 @@ const { const executionMode = 1; const nocoTestSuite = (apiType, dbType) => { - setCurrentMode(apiType, dbType); - if (0 == executionMode) { - t0.genTest(apiType, dbType); - } else { - t01.genTest(apiType, dbType); - } + setCurrentMode(apiType, dbType); + if (0 == executionMode) { + t0.genTest(apiType, dbType); + } else { + t01.genTest(apiType, dbType); + } - t6b.genTest(apiType, dbType); - t6d.genTest(apiType, dbType); - t6c.genTest(apiType, dbType); - t6f.genTest(apiType, dbType); - t6g.genTest(apiType, dbType); - // **deletes created project, hence place it @ end - t6e.genTest(apiType, dbType); + t6b.genTest(apiType, dbType); + // language validation kept common under REST MISC Suite + // t6d.genTest(apiType, dbType); + t6c.genTest(apiType, dbType); + t6f.genTest(apiType, dbType); + t6g.genTest(apiType, dbType); + // **deletes created project, hence place it @ end + t6e.genTest(apiType, dbType); - // intended to keep this after earlier project deletion - // creates project using excel & deletes it - t7a.genTest(apiType, dbType); + // intended to keep this after earlier project deletion + // creates project using excel & deletes it + t7a.genTest(apiType, dbType); }; nocoTestSuite("rest", "xcdb");