From db2b6bf006b86471a7064e5efce3d83134f6aa29 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 6 Sep 2022 11:40:22 +0800 Subject: [PATCH] chore: move cypress-v2 to cypress --- scripts/{cypress-v2 => cypress}/cypress.json | 0 .../docker-compose-pg-cy-quick.yml | 0 .../{cypress-v2 => cypress}/docker-compose-pg.yml | 0 .../{cypress-v2 => cypress}/fixtures/example.json | 0 .../fixtures/images/avatar-1.JPG | Bin .../fixtures/images/avatar-2.JPG | Bin .../fixtures/images/avatar-3.JPG | Bin .../fixtures/images/avatar-4.JPG | Bin .../fixtures/images/avatar-5.JPG | Bin .../fixtures/images/avatar-6.JPG | Bin .../fixtures/quickTest/noco_0_91_7.db | Bin .../fixtures/sampleFiles/1.json | 0 .../fixtures/sampleFiles/2.json | 0 .../fixtures/sampleFiles/3.json | 0 .../fixtures/sampleFiles/4.json | 0 .../fixtures/sampleFiles/5.json | 0 .../fixtures/sampleFiles/6.json | 0 .../fixtures/sampleFiles/Financial Sample.xlsx | Bin .../fixtures/sampleFiles/iFrame.html | 0 .../fixtures/sampleFiles/sample.xlsx | Bin .../fixtures/sampleFiles/simple.xlsx | Bin .../fixtures/sqlite-sakila/regenFiles/index.js | 0 .../sqlite-sakila/regenFiles/package-lock.json | 0 .../fixtures/sqlite-sakila/regenFiles/package.json | 0 .../regenFiles/recreate_sakila_sqlite.sh | 0 .../regenFiles/sqlite-sakila-delete-data.sql | 0 .../regenFiles/sqlite-sakila-drop-objects.sql | 0 .../regenFiles/sqlite-sakila-insert-data.sql | 0 .../regenFiles/sqlite-sakila-schema.sql | 0 .../fixtures/sqlite-sakila/sakila.db | Bin .../integration/common/00_pre_configurations.js | 0 .../integration/common/1a_table_operations.js | 0 .../common/1b_table_column_operations.js | 0 .../integration/common/1c_sql_view.js | 0 .../common/1d_pg_table_view_drag_drop_reorder.js | 0 .../common/1d_table_view_drag_drop_reorder.js | 0 .../integration/common/1e_meta_sync.js | 0 .../integration/common/1e_pg_meta_sync.js | 0 .../common/2a_table_with_belongs_to_colulmn.js | 0 .../integration/common/2b_table_with_m2m_column.js | 0 .../common/3a_filter_sort_fields_operations.js | 0 .../integration/common/3b_formula_column.js | 0 .../integration/common/3c_lookup_column.js | 0 .../integration/common/3d_rollup_column.js | 0 .../integration/common/3e_duration_column.js | 0 .../common/4a_table_view_grid_gallery_form.js | 0 .../integration/common/4b_table_view_share.js | 0 .../integration/common/4c_form_view_detailed.js | 0 .../integration/common/4d_table_view_grid_locked.js | 0 .../integration/common/4e_form_view_share.js | 0 .../integration/common/4f_grid_view_share.js | 0 .../integration/common/4f_pg_grid_view_share.js | 0 .../integration/common/5a_user_role.js | 0 .../integration/common/5b_preview_role.js | 0 .../integration/common/6b_downloadCsv.js | 0 .../integration/common/6c_swagger_api.js | 0 .../integration/common/6d_language_validation.js | 0 .../integration/common/6e_project_operations.js | 0 .../integration/common/6f_attachments.js | 0 .../integration/common/6g_base_share.js | 0 .../common/7a_create_project_from_excel.js | 0 .../integration/common/7b_import_from_airtable.js | 0 .../integration/common/8a_webhook.js | 0 .../integration/common/9a_QuickTest.js | 0 .../integration/spec/roleValidation.spec.js | 0 .../integration/test/explicitLogin.js | 0 .../integration/test/pg-restMisc.js | 0 .../integration/test/pg-restRoles.js | 0 .../integration/test/pg-restTableOps.js | 0 .../integration/test/pg-restViews.js | 0 .../integration/test/quickTest.js | 0 .../integration/test/restMisc.js | 0 .../integration/test/restRoles.js | 0 .../integration/test/restTableOps.js | 0 .../integration/test/restViews.js | 0 .../integration/test/xcdb-restMisc.js | 0 .../integration/test/xcdb-restRoles.js | 0 .../integration/test/xcdb-restTableOps.js | 0 .../integration/test/xcdb-restViews.js | 0 scripts/{cypress-v2 => cypress}/plugins/index.js | 0 .../{cypress-v2 => cypress}/plugins/read-xlsx.js | 0 scripts/{cypress-v2 => cypress}/plugins/server.js | 0 scripts/{cypress-v2 => cypress}/support/commands.js | 0 scripts/{cypress-v2 => cypress}/support/index.js | 0 .../support/page_objects/mainPage.js | 0 .../support/page_objects/navigation.js | 0 .../support/page_objects/projectConstants.js | 0 87 files changed, 0 insertions(+), 0 deletions(-) rename scripts/{cypress-v2 => cypress}/cypress.json (100%) rename scripts/{cypress-v2 => cypress}/docker-compose-pg-cy-quick.yml (100%) rename scripts/{cypress-v2 => cypress}/docker-compose-pg.yml (100%) rename scripts/{cypress-v2 => cypress}/fixtures/example.json (100%) rename scripts/{cypress-v2 => cypress}/fixtures/images/avatar-1.JPG (100%) rename scripts/{cypress-v2 => cypress}/fixtures/images/avatar-2.JPG (100%) rename scripts/{cypress-v2 => cypress}/fixtures/images/avatar-3.JPG (100%) rename scripts/{cypress-v2 => cypress}/fixtures/images/avatar-4.JPG (100%) rename scripts/{cypress-v2 => cypress}/fixtures/images/avatar-5.JPG (100%) rename scripts/{cypress-v2 => cypress}/fixtures/images/avatar-6.JPG (100%) rename scripts/{cypress-v2 => cypress}/fixtures/quickTest/noco_0_91_7.db (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sampleFiles/1.json (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sampleFiles/2.json (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sampleFiles/3.json (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sampleFiles/4.json (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sampleFiles/5.json (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sampleFiles/6.json (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sampleFiles/Financial Sample.xlsx (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sampleFiles/iFrame.html (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sampleFiles/sample.xlsx (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sampleFiles/simple.xlsx (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sqlite-sakila/regenFiles/index.js (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sqlite-sakila/regenFiles/package-lock.json (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sqlite-sakila/regenFiles/package.json (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sqlite-sakila/regenFiles/recreate_sakila_sqlite.sh (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-delete-data.sql (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-drop-objects.sql (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-insert-data.sql (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-schema.sql (100%) rename scripts/{cypress-v2 => cypress}/fixtures/sqlite-sakila/sakila.db (100%) rename scripts/{cypress-v2 => cypress}/integration/common/00_pre_configurations.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/1a_table_operations.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/1b_table_column_operations.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/1c_sql_view.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/1d_pg_table_view_drag_drop_reorder.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/1d_table_view_drag_drop_reorder.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/1e_meta_sync.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/1e_pg_meta_sync.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/2a_table_with_belongs_to_colulmn.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/2b_table_with_m2m_column.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/3a_filter_sort_fields_operations.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/3b_formula_column.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/3c_lookup_column.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/3d_rollup_column.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/3e_duration_column.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/4a_table_view_grid_gallery_form.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/4b_table_view_share.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/4c_form_view_detailed.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/4d_table_view_grid_locked.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/4e_form_view_share.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/4f_grid_view_share.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/4f_pg_grid_view_share.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/5a_user_role.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/5b_preview_role.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/6b_downloadCsv.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/6c_swagger_api.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/6d_language_validation.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/6e_project_operations.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/6f_attachments.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/6g_base_share.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/7a_create_project_from_excel.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/7b_import_from_airtable.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/8a_webhook.js (100%) rename scripts/{cypress-v2 => cypress}/integration/common/9a_QuickTest.js (100%) rename scripts/{cypress-v2 => cypress}/integration/spec/roleValidation.spec.js (100%) rename scripts/{cypress-v2 => cypress}/integration/test/explicitLogin.js (100%) rename scripts/{cypress-v2 => cypress}/integration/test/pg-restMisc.js (100%) rename scripts/{cypress-v2 => cypress}/integration/test/pg-restRoles.js (100%) rename scripts/{cypress-v2 => cypress}/integration/test/pg-restTableOps.js (100%) rename scripts/{cypress-v2 => cypress}/integration/test/pg-restViews.js (100%) rename scripts/{cypress-v2 => cypress}/integration/test/quickTest.js (100%) rename scripts/{cypress-v2 => cypress}/integration/test/restMisc.js (100%) rename scripts/{cypress-v2 => cypress}/integration/test/restRoles.js (100%) rename scripts/{cypress-v2 => cypress}/integration/test/restTableOps.js (100%) rename scripts/{cypress-v2 => cypress}/integration/test/restViews.js (100%) rename scripts/{cypress-v2 => cypress}/integration/test/xcdb-restMisc.js (100%) rename scripts/{cypress-v2 => cypress}/integration/test/xcdb-restRoles.js (100%) rename scripts/{cypress-v2 => cypress}/integration/test/xcdb-restTableOps.js (100%) rename scripts/{cypress-v2 => cypress}/integration/test/xcdb-restViews.js (100%) rename scripts/{cypress-v2 => cypress}/plugins/index.js (100%) rename scripts/{cypress-v2 => cypress}/plugins/read-xlsx.js (100%) rename scripts/{cypress-v2 => cypress}/plugins/server.js (100%) rename scripts/{cypress-v2 => cypress}/support/commands.js (100%) rename scripts/{cypress-v2 => cypress}/support/index.js (100%) rename scripts/{cypress-v2 => cypress}/support/page_objects/mainPage.js (100%) rename scripts/{cypress-v2 => cypress}/support/page_objects/navigation.js (100%) rename scripts/{cypress-v2 => cypress}/support/page_objects/projectConstants.js (100%) diff --git a/scripts/cypress-v2/cypress.json b/scripts/cypress/cypress.json similarity index 100% rename from scripts/cypress-v2/cypress.json rename to scripts/cypress/cypress.json diff --git a/scripts/cypress-v2/docker-compose-pg-cy-quick.yml b/scripts/cypress/docker-compose-pg-cy-quick.yml similarity index 100% rename from scripts/cypress-v2/docker-compose-pg-cy-quick.yml rename to scripts/cypress/docker-compose-pg-cy-quick.yml diff --git a/scripts/cypress-v2/docker-compose-pg.yml b/scripts/cypress/docker-compose-pg.yml similarity index 100% rename from scripts/cypress-v2/docker-compose-pg.yml rename to scripts/cypress/docker-compose-pg.yml diff --git a/scripts/cypress-v2/fixtures/example.json b/scripts/cypress/fixtures/example.json similarity index 100% rename from scripts/cypress-v2/fixtures/example.json rename to scripts/cypress/fixtures/example.json diff --git a/scripts/cypress-v2/fixtures/images/avatar-1.JPG b/scripts/cypress/fixtures/images/avatar-1.JPG similarity index 100% rename from scripts/cypress-v2/fixtures/images/avatar-1.JPG rename to scripts/cypress/fixtures/images/avatar-1.JPG diff --git a/scripts/cypress-v2/fixtures/images/avatar-2.JPG b/scripts/cypress/fixtures/images/avatar-2.JPG similarity index 100% rename from scripts/cypress-v2/fixtures/images/avatar-2.JPG rename to scripts/cypress/fixtures/images/avatar-2.JPG diff --git a/scripts/cypress-v2/fixtures/images/avatar-3.JPG b/scripts/cypress/fixtures/images/avatar-3.JPG similarity index 100% rename from scripts/cypress-v2/fixtures/images/avatar-3.JPG rename to scripts/cypress/fixtures/images/avatar-3.JPG diff --git a/scripts/cypress-v2/fixtures/images/avatar-4.JPG b/scripts/cypress/fixtures/images/avatar-4.JPG similarity index 100% rename from scripts/cypress-v2/fixtures/images/avatar-4.JPG rename to scripts/cypress/fixtures/images/avatar-4.JPG diff --git a/scripts/cypress-v2/fixtures/images/avatar-5.JPG b/scripts/cypress/fixtures/images/avatar-5.JPG similarity index 100% rename from scripts/cypress-v2/fixtures/images/avatar-5.JPG rename to scripts/cypress/fixtures/images/avatar-5.JPG diff --git a/scripts/cypress-v2/fixtures/images/avatar-6.JPG b/scripts/cypress/fixtures/images/avatar-6.JPG similarity index 100% rename from scripts/cypress-v2/fixtures/images/avatar-6.JPG rename to scripts/cypress/fixtures/images/avatar-6.JPG diff --git a/scripts/cypress-v2/fixtures/quickTest/noco_0_91_7.db b/scripts/cypress/fixtures/quickTest/noco_0_91_7.db similarity index 100% rename from scripts/cypress-v2/fixtures/quickTest/noco_0_91_7.db rename to scripts/cypress/fixtures/quickTest/noco_0_91_7.db diff --git a/scripts/cypress-v2/fixtures/sampleFiles/1.json b/scripts/cypress/fixtures/sampleFiles/1.json similarity index 100% rename from scripts/cypress-v2/fixtures/sampleFiles/1.json rename to scripts/cypress/fixtures/sampleFiles/1.json diff --git a/scripts/cypress-v2/fixtures/sampleFiles/2.json b/scripts/cypress/fixtures/sampleFiles/2.json similarity index 100% rename from scripts/cypress-v2/fixtures/sampleFiles/2.json rename to scripts/cypress/fixtures/sampleFiles/2.json diff --git a/scripts/cypress-v2/fixtures/sampleFiles/3.json b/scripts/cypress/fixtures/sampleFiles/3.json similarity index 100% rename from scripts/cypress-v2/fixtures/sampleFiles/3.json rename to scripts/cypress/fixtures/sampleFiles/3.json diff --git a/scripts/cypress-v2/fixtures/sampleFiles/4.json b/scripts/cypress/fixtures/sampleFiles/4.json similarity index 100% rename from scripts/cypress-v2/fixtures/sampleFiles/4.json rename to scripts/cypress/fixtures/sampleFiles/4.json diff --git a/scripts/cypress-v2/fixtures/sampleFiles/5.json b/scripts/cypress/fixtures/sampleFiles/5.json similarity index 100% rename from scripts/cypress-v2/fixtures/sampleFiles/5.json rename to scripts/cypress/fixtures/sampleFiles/5.json diff --git a/scripts/cypress-v2/fixtures/sampleFiles/6.json b/scripts/cypress/fixtures/sampleFiles/6.json similarity index 100% rename from scripts/cypress-v2/fixtures/sampleFiles/6.json rename to scripts/cypress/fixtures/sampleFiles/6.json diff --git a/scripts/cypress-v2/fixtures/sampleFiles/Financial Sample.xlsx b/scripts/cypress/fixtures/sampleFiles/Financial Sample.xlsx similarity index 100% rename from scripts/cypress-v2/fixtures/sampleFiles/Financial Sample.xlsx rename to scripts/cypress/fixtures/sampleFiles/Financial Sample.xlsx diff --git a/scripts/cypress-v2/fixtures/sampleFiles/iFrame.html b/scripts/cypress/fixtures/sampleFiles/iFrame.html similarity index 100% rename from scripts/cypress-v2/fixtures/sampleFiles/iFrame.html rename to scripts/cypress/fixtures/sampleFiles/iFrame.html diff --git a/scripts/cypress-v2/fixtures/sampleFiles/sample.xlsx b/scripts/cypress/fixtures/sampleFiles/sample.xlsx similarity index 100% rename from scripts/cypress-v2/fixtures/sampleFiles/sample.xlsx rename to scripts/cypress/fixtures/sampleFiles/sample.xlsx diff --git a/scripts/cypress-v2/fixtures/sampleFiles/simple.xlsx b/scripts/cypress/fixtures/sampleFiles/simple.xlsx similarity index 100% rename from scripts/cypress-v2/fixtures/sampleFiles/simple.xlsx rename to scripts/cypress/fixtures/sampleFiles/simple.xlsx diff --git a/scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/index.js b/scripts/cypress/fixtures/sqlite-sakila/regenFiles/index.js similarity index 100% rename from scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/index.js rename to scripts/cypress/fixtures/sqlite-sakila/regenFiles/index.js diff --git a/scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/package-lock.json b/scripts/cypress/fixtures/sqlite-sakila/regenFiles/package-lock.json similarity index 100% rename from scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/package-lock.json rename to scripts/cypress/fixtures/sqlite-sakila/regenFiles/package-lock.json diff --git a/scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/package.json b/scripts/cypress/fixtures/sqlite-sakila/regenFiles/package.json similarity index 100% rename from scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/package.json rename to scripts/cypress/fixtures/sqlite-sakila/regenFiles/package.json diff --git a/scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/recreate_sakila_sqlite.sh b/scripts/cypress/fixtures/sqlite-sakila/regenFiles/recreate_sakila_sqlite.sh similarity index 100% rename from scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/recreate_sakila_sqlite.sh rename to scripts/cypress/fixtures/sqlite-sakila/regenFiles/recreate_sakila_sqlite.sh diff --git a/scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-delete-data.sql b/scripts/cypress/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-delete-data.sql similarity index 100% rename from scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-delete-data.sql rename to scripts/cypress/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-delete-data.sql diff --git a/scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-drop-objects.sql b/scripts/cypress/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-drop-objects.sql similarity index 100% rename from scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-drop-objects.sql rename to scripts/cypress/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-drop-objects.sql diff --git a/scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-insert-data.sql b/scripts/cypress/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-insert-data.sql similarity index 100% rename from scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-insert-data.sql rename to scripts/cypress/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-insert-data.sql diff --git a/scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-schema.sql b/scripts/cypress/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-schema.sql similarity index 100% rename from scripts/cypress-v2/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-schema.sql rename to scripts/cypress/fixtures/sqlite-sakila/regenFiles/sqlite-sakila-schema.sql diff --git a/scripts/cypress-v2/fixtures/sqlite-sakila/sakila.db b/scripts/cypress/fixtures/sqlite-sakila/sakila.db similarity index 100% rename from scripts/cypress-v2/fixtures/sqlite-sakila/sakila.db rename to scripts/cypress/fixtures/sqlite-sakila/sakila.db diff --git a/scripts/cypress-v2/integration/common/00_pre_configurations.js b/scripts/cypress/integration/common/00_pre_configurations.js similarity index 100% rename from scripts/cypress-v2/integration/common/00_pre_configurations.js rename to scripts/cypress/integration/common/00_pre_configurations.js diff --git a/scripts/cypress-v2/integration/common/1a_table_operations.js b/scripts/cypress/integration/common/1a_table_operations.js similarity index 100% rename from scripts/cypress-v2/integration/common/1a_table_operations.js rename to scripts/cypress/integration/common/1a_table_operations.js diff --git a/scripts/cypress-v2/integration/common/1b_table_column_operations.js b/scripts/cypress/integration/common/1b_table_column_operations.js similarity index 100% rename from scripts/cypress-v2/integration/common/1b_table_column_operations.js rename to scripts/cypress/integration/common/1b_table_column_operations.js diff --git a/scripts/cypress-v2/integration/common/1c_sql_view.js b/scripts/cypress/integration/common/1c_sql_view.js similarity index 100% rename from scripts/cypress-v2/integration/common/1c_sql_view.js rename to scripts/cypress/integration/common/1c_sql_view.js diff --git a/scripts/cypress-v2/integration/common/1d_pg_table_view_drag_drop_reorder.js b/scripts/cypress/integration/common/1d_pg_table_view_drag_drop_reorder.js similarity index 100% rename from scripts/cypress-v2/integration/common/1d_pg_table_view_drag_drop_reorder.js rename to scripts/cypress/integration/common/1d_pg_table_view_drag_drop_reorder.js diff --git a/scripts/cypress-v2/integration/common/1d_table_view_drag_drop_reorder.js b/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js similarity index 100% rename from scripts/cypress-v2/integration/common/1d_table_view_drag_drop_reorder.js rename to scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js diff --git a/scripts/cypress-v2/integration/common/1e_meta_sync.js b/scripts/cypress/integration/common/1e_meta_sync.js similarity index 100% rename from scripts/cypress-v2/integration/common/1e_meta_sync.js rename to scripts/cypress/integration/common/1e_meta_sync.js diff --git a/scripts/cypress-v2/integration/common/1e_pg_meta_sync.js b/scripts/cypress/integration/common/1e_pg_meta_sync.js similarity index 100% rename from scripts/cypress-v2/integration/common/1e_pg_meta_sync.js rename to scripts/cypress/integration/common/1e_pg_meta_sync.js diff --git a/scripts/cypress-v2/integration/common/2a_table_with_belongs_to_colulmn.js b/scripts/cypress/integration/common/2a_table_with_belongs_to_colulmn.js similarity index 100% rename from scripts/cypress-v2/integration/common/2a_table_with_belongs_to_colulmn.js rename to scripts/cypress/integration/common/2a_table_with_belongs_to_colulmn.js diff --git a/scripts/cypress-v2/integration/common/2b_table_with_m2m_column.js b/scripts/cypress/integration/common/2b_table_with_m2m_column.js similarity index 100% rename from scripts/cypress-v2/integration/common/2b_table_with_m2m_column.js rename to scripts/cypress/integration/common/2b_table_with_m2m_column.js diff --git a/scripts/cypress-v2/integration/common/3a_filter_sort_fields_operations.js b/scripts/cypress/integration/common/3a_filter_sort_fields_operations.js similarity index 100% rename from scripts/cypress-v2/integration/common/3a_filter_sort_fields_operations.js rename to scripts/cypress/integration/common/3a_filter_sort_fields_operations.js diff --git a/scripts/cypress-v2/integration/common/3b_formula_column.js b/scripts/cypress/integration/common/3b_formula_column.js similarity index 100% rename from scripts/cypress-v2/integration/common/3b_formula_column.js rename to scripts/cypress/integration/common/3b_formula_column.js diff --git a/scripts/cypress-v2/integration/common/3c_lookup_column.js b/scripts/cypress/integration/common/3c_lookup_column.js similarity index 100% rename from scripts/cypress-v2/integration/common/3c_lookup_column.js rename to scripts/cypress/integration/common/3c_lookup_column.js diff --git a/scripts/cypress-v2/integration/common/3d_rollup_column.js b/scripts/cypress/integration/common/3d_rollup_column.js similarity index 100% rename from scripts/cypress-v2/integration/common/3d_rollup_column.js rename to scripts/cypress/integration/common/3d_rollup_column.js diff --git a/scripts/cypress-v2/integration/common/3e_duration_column.js b/scripts/cypress/integration/common/3e_duration_column.js similarity index 100% rename from scripts/cypress-v2/integration/common/3e_duration_column.js rename to scripts/cypress/integration/common/3e_duration_column.js diff --git a/scripts/cypress-v2/integration/common/4a_table_view_grid_gallery_form.js b/scripts/cypress/integration/common/4a_table_view_grid_gallery_form.js similarity index 100% rename from scripts/cypress-v2/integration/common/4a_table_view_grid_gallery_form.js rename to scripts/cypress/integration/common/4a_table_view_grid_gallery_form.js diff --git a/scripts/cypress-v2/integration/common/4b_table_view_share.js b/scripts/cypress/integration/common/4b_table_view_share.js similarity index 100% rename from scripts/cypress-v2/integration/common/4b_table_view_share.js rename to scripts/cypress/integration/common/4b_table_view_share.js diff --git a/scripts/cypress-v2/integration/common/4c_form_view_detailed.js b/scripts/cypress/integration/common/4c_form_view_detailed.js similarity index 100% rename from scripts/cypress-v2/integration/common/4c_form_view_detailed.js rename to scripts/cypress/integration/common/4c_form_view_detailed.js diff --git a/scripts/cypress-v2/integration/common/4d_table_view_grid_locked.js b/scripts/cypress/integration/common/4d_table_view_grid_locked.js similarity index 100% rename from scripts/cypress-v2/integration/common/4d_table_view_grid_locked.js rename to scripts/cypress/integration/common/4d_table_view_grid_locked.js diff --git a/scripts/cypress-v2/integration/common/4e_form_view_share.js b/scripts/cypress/integration/common/4e_form_view_share.js similarity index 100% rename from scripts/cypress-v2/integration/common/4e_form_view_share.js rename to scripts/cypress/integration/common/4e_form_view_share.js diff --git a/scripts/cypress-v2/integration/common/4f_grid_view_share.js b/scripts/cypress/integration/common/4f_grid_view_share.js similarity index 100% rename from scripts/cypress-v2/integration/common/4f_grid_view_share.js rename to scripts/cypress/integration/common/4f_grid_view_share.js diff --git a/scripts/cypress-v2/integration/common/4f_pg_grid_view_share.js b/scripts/cypress/integration/common/4f_pg_grid_view_share.js similarity index 100% rename from scripts/cypress-v2/integration/common/4f_pg_grid_view_share.js rename to scripts/cypress/integration/common/4f_pg_grid_view_share.js diff --git a/scripts/cypress-v2/integration/common/5a_user_role.js b/scripts/cypress/integration/common/5a_user_role.js similarity index 100% rename from scripts/cypress-v2/integration/common/5a_user_role.js rename to scripts/cypress/integration/common/5a_user_role.js diff --git a/scripts/cypress-v2/integration/common/5b_preview_role.js b/scripts/cypress/integration/common/5b_preview_role.js similarity index 100% rename from scripts/cypress-v2/integration/common/5b_preview_role.js rename to scripts/cypress/integration/common/5b_preview_role.js diff --git a/scripts/cypress-v2/integration/common/6b_downloadCsv.js b/scripts/cypress/integration/common/6b_downloadCsv.js similarity index 100% rename from scripts/cypress-v2/integration/common/6b_downloadCsv.js rename to scripts/cypress/integration/common/6b_downloadCsv.js diff --git a/scripts/cypress-v2/integration/common/6c_swagger_api.js b/scripts/cypress/integration/common/6c_swagger_api.js similarity index 100% rename from scripts/cypress-v2/integration/common/6c_swagger_api.js rename to scripts/cypress/integration/common/6c_swagger_api.js diff --git a/scripts/cypress-v2/integration/common/6d_language_validation.js b/scripts/cypress/integration/common/6d_language_validation.js similarity index 100% rename from scripts/cypress-v2/integration/common/6d_language_validation.js rename to scripts/cypress/integration/common/6d_language_validation.js diff --git a/scripts/cypress-v2/integration/common/6e_project_operations.js b/scripts/cypress/integration/common/6e_project_operations.js similarity index 100% rename from scripts/cypress-v2/integration/common/6e_project_operations.js rename to scripts/cypress/integration/common/6e_project_operations.js diff --git a/scripts/cypress-v2/integration/common/6f_attachments.js b/scripts/cypress/integration/common/6f_attachments.js similarity index 100% rename from scripts/cypress-v2/integration/common/6f_attachments.js rename to scripts/cypress/integration/common/6f_attachments.js diff --git a/scripts/cypress-v2/integration/common/6g_base_share.js b/scripts/cypress/integration/common/6g_base_share.js similarity index 100% rename from scripts/cypress-v2/integration/common/6g_base_share.js rename to scripts/cypress/integration/common/6g_base_share.js diff --git a/scripts/cypress-v2/integration/common/7a_create_project_from_excel.js b/scripts/cypress/integration/common/7a_create_project_from_excel.js similarity index 100% rename from scripts/cypress-v2/integration/common/7a_create_project_from_excel.js rename to scripts/cypress/integration/common/7a_create_project_from_excel.js diff --git a/scripts/cypress-v2/integration/common/7b_import_from_airtable.js b/scripts/cypress/integration/common/7b_import_from_airtable.js similarity index 100% rename from scripts/cypress-v2/integration/common/7b_import_from_airtable.js rename to scripts/cypress/integration/common/7b_import_from_airtable.js diff --git a/scripts/cypress-v2/integration/common/8a_webhook.js b/scripts/cypress/integration/common/8a_webhook.js similarity index 100% rename from scripts/cypress-v2/integration/common/8a_webhook.js rename to scripts/cypress/integration/common/8a_webhook.js diff --git a/scripts/cypress-v2/integration/common/9a_QuickTest.js b/scripts/cypress/integration/common/9a_QuickTest.js similarity index 100% rename from scripts/cypress-v2/integration/common/9a_QuickTest.js rename to scripts/cypress/integration/common/9a_QuickTest.js diff --git a/scripts/cypress-v2/integration/spec/roleValidation.spec.js b/scripts/cypress/integration/spec/roleValidation.spec.js similarity index 100% rename from scripts/cypress-v2/integration/spec/roleValidation.spec.js rename to scripts/cypress/integration/spec/roleValidation.spec.js diff --git a/scripts/cypress-v2/integration/test/explicitLogin.js b/scripts/cypress/integration/test/explicitLogin.js similarity index 100% rename from scripts/cypress-v2/integration/test/explicitLogin.js rename to scripts/cypress/integration/test/explicitLogin.js diff --git a/scripts/cypress-v2/integration/test/pg-restMisc.js b/scripts/cypress/integration/test/pg-restMisc.js similarity index 100% rename from scripts/cypress-v2/integration/test/pg-restMisc.js rename to scripts/cypress/integration/test/pg-restMisc.js diff --git a/scripts/cypress-v2/integration/test/pg-restRoles.js b/scripts/cypress/integration/test/pg-restRoles.js similarity index 100% rename from scripts/cypress-v2/integration/test/pg-restRoles.js rename to scripts/cypress/integration/test/pg-restRoles.js diff --git a/scripts/cypress-v2/integration/test/pg-restTableOps.js b/scripts/cypress/integration/test/pg-restTableOps.js similarity index 100% rename from scripts/cypress-v2/integration/test/pg-restTableOps.js rename to scripts/cypress/integration/test/pg-restTableOps.js diff --git a/scripts/cypress-v2/integration/test/pg-restViews.js b/scripts/cypress/integration/test/pg-restViews.js similarity index 100% rename from scripts/cypress-v2/integration/test/pg-restViews.js rename to scripts/cypress/integration/test/pg-restViews.js diff --git a/scripts/cypress-v2/integration/test/quickTest.js b/scripts/cypress/integration/test/quickTest.js similarity index 100% rename from scripts/cypress-v2/integration/test/quickTest.js rename to scripts/cypress/integration/test/quickTest.js diff --git a/scripts/cypress-v2/integration/test/restMisc.js b/scripts/cypress/integration/test/restMisc.js similarity index 100% rename from scripts/cypress-v2/integration/test/restMisc.js rename to scripts/cypress/integration/test/restMisc.js diff --git a/scripts/cypress-v2/integration/test/restRoles.js b/scripts/cypress/integration/test/restRoles.js similarity index 100% rename from scripts/cypress-v2/integration/test/restRoles.js rename to scripts/cypress/integration/test/restRoles.js diff --git a/scripts/cypress-v2/integration/test/restTableOps.js b/scripts/cypress/integration/test/restTableOps.js similarity index 100% rename from scripts/cypress-v2/integration/test/restTableOps.js rename to scripts/cypress/integration/test/restTableOps.js diff --git a/scripts/cypress-v2/integration/test/restViews.js b/scripts/cypress/integration/test/restViews.js similarity index 100% rename from scripts/cypress-v2/integration/test/restViews.js rename to scripts/cypress/integration/test/restViews.js diff --git a/scripts/cypress-v2/integration/test/xcdb-restMisc.js b/scripts/cypress/integration/test/xcdb-restMisc.js similarity index 100% rename from scripts/cypress-v2/integration/test/xcdb-restMisc.js rename to scripts/cypress/integration/test/xcdb-restMisc.js diff --git a/scripts/cypress-v2/integration/test/xcdb-restRoles.js b/scripts/cypress/integration/test/xcdb-restRoles.js similarity index 100% rename from scripts/cypress-v2/integration/test/xcdb-restRoles.js rename to scripts/cypress/integration/test/xcdb-restRoles.js diff --git a/scripts/cypress-v2/integration/test/xcdb-restTableOps.js b/scripts/cypress/integration/test/xcdb-restTableOps.js similarity index 100% rename from scripts/cypress-v2/integration/test/xcdb-restTableOps.js rename to scripts/cypress/integration/test/xcdb-restTableOps.js diff --git a/scripts/cypress-v2/integration/test/xcdb-restViews.js b/scripts/cypress/integration/test/xcdb-restViews.js similarity index 100% rename from scripts/cypress-v2/integration/test/xcdb-restViews.js rename to scripts/cypress/integration/test/xcdb-restViews.js diff --git a/scripts/cypress-v2/plugins/index.js b/scripts/cypress/plugins/index.js similarity index 100% rename from scripts/cypress-v2/plugins/index.js rename to scripts/cypress/plugins/index.js diff --git a/scripts/cypress-v2/plugins/read-xlsx.js b/scripts/cypress/plugins/read-xlsx.js similarity index 100% rename from scripts/cypress-v2/plugins/read-xlsx.js rename to scripts/cypress/plugins/read-xlsx.js diff --git a/scripts/cypress-v2/plugins/server.js b/scripts/cypress/plugins/server.js similarity index 100% rename from scripts/cypress-v2/plugins/server.js rename to scripts/cypress/plugins/server.js diff --git a/scripts/cypress-v2/support/commands.js b/scripts/cypress/support/commands.js similarity index 100% rename from scripts/cypress-v2/support/commands.js rename to scripts/cypress/support/commands.js diff --git a/scripts/cypress-v2/support/index.js b/scripts/cypress/support/index.js similarity index 100% rename from scripts/cypress-v2/support/index.js rename to scripts/cypress/support/index.js diff --git a/scripts/cypress-v2/support/page_objects/mainPage.js b/scripts/cypress/support/page_objects/mainPage.js similarity index 100% rename from scripts/cypress-v2/support/page_objects/mainPage.js rename to scripts/cypress/support/page_objects/mainPage.js diff --git a/scripts/cypress-v2/support/page_objects/navigation.js b/scripts/cypress/support/page_objects/navigation.js similarity index 100% rename from scripts/cypress-v2/support/page_objects/navigation.js rename to scripts/cypress/support/page_objects/navigation.js diff --git a/scripts/cypress-v2/support/page_objects/projectConstants.js b/scripts/cypress/support/page_objects/projectConstants.js similarity index 100% rename from scripts/cypress-v2/support/page_objects/projectConstants.js rename to scripts/cypress/support/page_objects/projectConstants.js