From 496c31e4f4ff54ca234b19c8c70d40e33e571927 Mon Sep 17 00:00:00 2001 From: ADAMJR Date: Wed, 10 Nov 2021 19:22:04 +0000 Subject: [PATCH] Frontend: Rename cypress/ to e2e/ --- .vscode/settings.json | 3 +++ frontend/cypress.json | 9 ++++++++- .../_integration/1-getting-started/todo.spec.js | 0 .../2-advanced-examples/actions.spec.js | 0 .../2-advanced-examples/aliasing.spec.js | 0 .../2-advanced-examples/assertions.spec.js | 0 .../2-advanced-examples/connectors.spec.js | 0 .../2-advanced-examples/cookies.spec.js | 0 .../2-advanced-examples/cypress_api.spec.js | 0 .../_integration/2-advanced-examples/files.spec.js | 0 .../2-advanced-examples/local_storage.spec.js | 0 .../2-advanced-examples/location.spec.js | 0 .../_integration/2-advanced-examples/misc.spec.js | 0 .../2-advanced-examples/navigation.spec.js | 0 .../2-advanced-examples/network_requests.spec.js | 0 .../2-advanced-examples/querying.spec.js | 0 .../2-advanced-examples/spies_stubs_clocks.spec.js | 0 .../2-advanced-examples/traversal.spec.js | 0 .../2-advanced-examples/utilities.spec.js | 0 .../2-advanced-examples/viewport.spec.js | 0 .../2-advanced-examples/waiting.spec.js | 0 .../_integration/2-advanced-examples/window.spec.js | 0 frontend/{cypress => e2e}/fixtures/example.json | 0 .../integration/channel-settings.tests.ts} | 5 +---- .../integration/essential-flow.tests.ts} | 0 frontend/{cypress => e2e}/plugins/index.ts | 0 ...redirects to app -- before all hook (failed).png | Bin frontend/{cypress => e2e}/support/commands.ts | 0 frontend/{cypress => e2e}/support/index.ts | 0 .../{cypress => e2e}/videos/essential-flow.ts.mp4 | Bin 30 files changed, 12 insertions(+), 5 deletions(-) rename frontend/{cypress => e2e}/_integration/1-getting-started/todo.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/actions.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/aliasing.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/assertions.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/connectors.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/cookies.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/cypress_api.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/files.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/local_storage.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/location.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/misc.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/navigation.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/network_requests.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/querying.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/spies_stubs_clocks.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/traversal.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/utilities.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/viewport.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/waiting.spec.js (100%) rename frontend/{cypress => e2e}/_integration/2-advanced-examples/window.spec.js (100%) rename frontend/{cypress => e2e}/fixtures/example.json (100%) rename frontend/{cypress/integration/channel-settings.ts => e2e/integration/channel-settings.tests.ts} (77%) rename frontend/{cypress/integration/essential-flow.ts => e2e/integration/essential-flow.tests.ts} (100%) rename frontend/{cypress => e2e}/plugins/index.ts (100%) rename frontend/{cypress => e2e}/screenshots/essential-flow.ts/essential navigation flow -- register user, redirects to app -- before all hook (failed).png (100%) rename frontend/{cypress => e2e}/support/commands.ts (100%) rename frontend/{cypress => e2e}/support/index.ts (100%) rename frontend/{cypress => e2e}/videos/essential-flow.ts.mp4 (100%) diff --git a/.vscode/settings.json b/.vscode/settings.json index a4abc4bd..58c4702c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,4 +3,7 @@ "prettier.singleQuote": true, "typescript.preferences.quoteStyle": "single", "editor.tabSize": 2, + "material-icon-theme.files.associations": { + "*.tests.ts": "test-ts" + }, } \ No newline at end of file diff --git a/frontend/cypress.json b/frontend/cypress.json index cd548612..422ba1c4 100644 --- a/frontend/cypress.json +++ b/frontend/cypress.json @@ -2,5 +2,12 @@ "env": { "PORT": 4200, "URL": "http://localhost" - } + }, + "fixturesFolder": "e2e/fixtures", + "integrationFolder": "e2e/integration", + "pluginsFile": "e2e/plugins/index.ts", + "screenshotsFolder": "e2e/screenshots", + "videosFolder": "e2e/videos", + "downloadsFolder": "e2e/downloads", + "supportFile": "e2e/support/index.ts" } diff --git a/frontend/cypress/_integration/1-getting-started/todo.spec.js b/frontend/e2e/_integration/1-getting-started/todo.spec.js similarity index 100% rename from frontend/cypress/_integration/1-getting-started/todo.spec.js rename to frontend/e2e/_integration/1-getting-started/todo.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/actions.spec.js b/frontend/e2e/_integration/2-advanced-examples/actions.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/actions.spec.js rename to frontend/e2e/_integration/2-advanced-examples/actions.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/aliasing.spec.js b/frontend/e2e/_integration/2-advanced-examples/aliasing.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/aliasing.spec.js rename to frontend/e2e/_integration/2-advanced-examples/aliasing.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/assertions.spec.js b/frontend/e2e/_integration/2-advanced-examples/assertions.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/assertions.spec.js rename to frontend/e2e/_integration/2-advanced-examples/assertions.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/connectors.spec.js b/frontend/e2e/_integration/2-advanced-examples/connectors.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/connectors.spec.js rename to frontend/e2e/_integration/2-advanced-examples/connectors.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/cookies.spec.js b/frontend/e2e/_integration/2-advanced-examples/cookies.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/cookies.spec.js rename to frontend/e2e/_integration/2-advanced-examples/cookies.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/cypress_api.spec.js b/frontend/e2e/_integration/2-advanced-examples/cypress_api.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/cypress_api.spec.js rename to frontend/e2e/_integration/2-advanced-examples/cypress_api.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/files.spec.js b/frontend/e2e/_integration/2-advanced-examples/files.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/files.spec.js rename to frontend/e2e/_integration/2-advanced-examples/files.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/local_storage.spec.js b/frontend/e2e/_integration/2-advanced-examples/local_storage.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/local_storage.spec.js rename to frontend/e2e/_integration/2-advanced-examples/local_storage.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/location.spec.js b/frontend/e2e/_integration/2-advanced-examples/location.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/location.spec.js rename to frontend/e2e/_integration/2-advanced-examples/location.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/misc.spec.js b/frontend/e2e/_integration/2-advanced-examples/misc.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/misc.spec.js rename to frontend/e2e/_integration/2-advanced-examples/misc.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/navigation.spec.js b/frontend/e2e/_integration/2-advanced-examples/navigation.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/navigation.spec.js rename to frontend/e2e/_integration/2-advanced-examples/navigation.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/network_requests.spec.js b/frontend/e2e/_integration/2-advanced-examples/network_requests.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/network_requests.spec.js rename to frontend/e2e/_integration/2-advanced-examples/network_requests.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/querying.spec.js b/frontend/e2e/_integration/2-advanced-examples/querying.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/querying.spec.js rename to frontend/e2e/_integration/2-advanced-examples/querying.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/spies_stubs_clocks.spec.js b/frontend/e2e/_integration/2-advanced-examples/spies_stubs_clocks.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/spies_stubs_clocks.spec.js rename to frontend/e2e/_integration/2-advanced-examples/spies_stubs_clocks.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/traversal.spec.js b/frontend/e2e/_integration/2-advanced-examples/traversal.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/traversal.spec.js rename to frontend/e2e/_integration/2-advanced-examples/traversal.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/utilities.spec.js b/frontend/e2e/_integration/2-advanced-examples/utilities.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/utilities.spec.js rename to frontend/e2e/_integration/2-advanced-examples/utilities.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/viewport.spec.js b/frontend/e2e/_integration/2-advanced-examples/viewport.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/viewport.spec.js rename to frontend/e2e/_integration/2-advanced-examples/viewport.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/waiting.spec.js b/frontend/e2e/_integration/2-advanced-examples/waiting.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/waiting.spec.js rename to frontend/e2e/_integration/2-advanced-examples/waiting.spec.js diff --git a/frontend/cypress/_integration/2-advanced-examples/window.spec.js b/frontend/e2e/_integration/2-advanced-examples/window.spec.js similarity index 100% rename from frontend/cypress/_integration/2-advanced-examples/window.spec.js rename to frontend/e2e/_integration/2-advanced-examples/window.spec.js diff --git a/frontend/cypress/fixtures/example.json b/frontend/e2e/fixtures/example.json similarity index 100% rename from frontend/cypress/fixtures/example.json rename to frontend/e2e/fixtures/example.json diff --git a/frontend/cypress/integration/channel-settings.ts b/frontend/e2e/integration/channel-settings.tests.ts similarity index 77% rename from frontend/cypress/integration/channel-settings.ts rename to frontend/e2e/integration/channel-settings.tests.ts index 57ea2832..605df4d5 100644 --- a/frontend/cypress/integration/channel-settings.ts +++ b/frontend/e2e/integration/channel-settings.tests.ts @@ -9,11 +9,10 @@ describe('channel-settings', () => { before(() => { cy.get('.sidebar-tabs [data-icon="cog"]').first().click(); cy.contains('Perms').click(); - cy.contains('Add role...').click(); }); it('deny send messages in channel, opens save dialog', () => { - cy.get('[class*="option"]').contains('@everyone').click(); + cy.get('#SEND_MESSAGES').click({ force: true }); cy.get('#SEND_MESSAGES').click({ force: true }); cy.contains('unsaved changes').should('be.visible'); @@ -23,8 +22,6 @@ describe('channel-settings', () => { cy.contains('Save').click(); cy.contains('Overview').click(); cy.contains('Perms').click(); - cy.contains('Add role...').click(); - cy.get('[class*="option"]').contains('@everyone').click(); cy.get('#SEND_MESSAGES[value=off]').should('exist'); }); diff --git a/frontend/cypress/integration/essential-flow.ts b/frontend/e2e/integration/essential-flow.tests.ts similarity index 100% rename from frontend/cypress/integration/essential-flow.ts rename to frontend/e2e/integration/essential-flow.tests.ts diff --git a/frontend/cypress/plugins/index.ts b/frontend/e2e/plugins/index.ts similarity index 100% rename from frontend/cypress/plugins/index.ts rename to frontend/e2e/plugins/index.ts diff --git a/frontend/cypress/screenshots/essential-flow.ts/essential navigation flow -- register user, redirects to app -- before all hook (failed).png b/frontend/e2e/screenshots/essential-flow.ts/essential navigation flow -- register user, redirects to app -- before all hook (failed).png similarity index 100% rename from frontend/cypress/screenshots/essential-flow.ts/essential navigation flow -- register user, redirects to app -- before all hook (failed).png rename to frontend/e2e/screenshots/essential-flow.ts/essential navigation flow -- register user, redirects to app -- before all hook (failed).png diff --git a/frontend/cypress/support/commands.ts b/frontend/e2e/support/commands.ts similarity index 100% rename from frontend/cypress/support/commands.ts rename to frontend/e2e/support/commands.ts diff --git a/frontend/cypress/support/index.ts b/frontend/e2e/support/index.ts similarity index 100% rename from frontend/cypress/support/index.ts rename to frontend/e2e/support/index.ts diff --git a/frontend/cypress/videos/essential-flow.ts.mp4 b/frontend/e2e/videos/essential-flow.ts.mp4 similarity index 100% rename from frontend/cypress/videos/essential-flow.ts.mp4 rename to frontend/e2e/videos/essential-flow.ts.mp4