Move /e2e -> /e2e-tests

.github/codeql/codeql-config.yml

@@ -14,6 +14,6 @@ paths-ignore:
   - templates
   - tests
   - 'api4/*_local.go'
-  - webapp/channels/e2e
   - webapp/channels/tests
-  - '**/*.test.*'
+  - '**/*.test.*'
+  - e2e-tests

.github/workflows/channels-ci.yml

@@ -32,14 +32,14 @@ jobs:
       #   with:
       #     path: |
       #       '**/node_modules'
-      #       'e2e/playwright/node_modules'
-      #       'e2e/cypress/node_modules'
-      #     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('e2e/cypress/package-lock.json') }}-${{ hashFiles('e2e/playwright/package-lock.json') }}
+      #       'e2e-tests/playwright/node_modules'
+      #       'e2e-tests/cypress/node_modules'
+      #     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('e2e-tests/cypress/package-lock.json') }}-${{ hashFiles('e2e-tests/playwright/package-lock.json') }}
       - name: ci/get-node-modules
         # if: steps.npm-cache.outputs.cache-hit != 'true'
         run: |
           make node_modules
-          # make channels/e2e/playwright/node_modules
+          # make channels/e2e-tests/playwright/node_modules
       - name: ci/lint
         run: |
           npm run check
@@ -63,14 +63,14 @@ jobs:
       #   with:
       #     path: |
       #       '**/node_modules'
-      #       'e2e/playwright/node_modules'
-      #       'e2e/cypress/node_modules'
-      #     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('e2e/cypress/package-lock.json') }}-${{ hashFiles('e2e/playwright/package-lock.json') }}
+      #       'e2e-tests/playwright/node_modules'
+      #       'e2e-tests/cypress/node_modules'
+      #     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('e2e-tests/cypress/package-lock.json') }}-${{ hashFiles('e2e-tests/playwright/package-lock.json') }}
       - name: ci/get-node-modules
         # if: steps.npm-cache.outputs.cache-hit != 'true'
         run: |
           make node_modules
-          # make channels/e2e/playwright/node_modules
+          # make channels/e2e-tests/playwright/node_modules
       - name: ci/lint
         working-directory: webapp/channels
         run: |
@@ -103,14 +103,14 @@ jobs:
       #   with:
       #     path: |
       #       '**/node_modules'
-      #       'e2e/playwright/node_modules'
-      #       'e2e/cypress/node_modules'
-      #     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('e2e/cypress/package-lock.json') }}-${{ hashFiles('e2e/playwright/package-lock.json') }}
+      #       'e2e-tests/playwright/node_modules'
+      #       'e2e-tests/cypress/node_modules'
+      #     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('e2e-tests/cypress/package-lock.json') }}-${{ hashFiles('e2e-tests/playwright/package-lock.json') }}
       - name: ci/get-node-modules
         # if: steps.npm-cache.outputs.cache-hit != 'true'
         run: |
           make node_modules
-          # make channels/e2e/playwright/node_modules
+          # make channels/e2e-tests/playwright/node_modules
       - name: ci/lint
         run: |
           npm run check-types
@@ -138,14 +138,14 @@ jobs:
       #   with:
       #     path: |
       #       '**/node_modules'
-      #       'e2e/playwright/node_modules'
-      #       'e2e/cypress/node_modules'
-      #     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('e2e/cypress/package-lock.json') }}-${{ hashFiles('e2e/playwright/package-lock.json') }}
+      #       'e2e-tests/playwright/node_modules'
+      #       'e2e-tests/cypress/node_modules'
+      #     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('e2e-tests/cypress/package-lock.json') }}-${{ hashFiles('e2e-tests/playwright/package-lock.json') }}
       - name: ci/get-node-modules
         # if: steps.npm-cache.outputs.cache-hit != 'true'
         run: |
           make node_modules
-          # make channels/e2e/playwright/node_modules
+          # make channels/e2e-tests/playwright/node_modules
       - name: ci/test
         env:
           NODE_OPTIONS: --max_old_space_size=5120
@@ -174,14 +174,14 @@ jobs:
       #   with:
       #     path: |
       #       '**/node_modules'
-      #       'e2e/playwright/node_modules'
-      #       'e2e/cypress/node_modules'
-      #     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('e2e/cypress/package-lock.json') }}-${{ hashFiles('e2e/playwright/package-lock.json') }}
+      #       'e2e-tests/playwright/node_modules'
+      #       'e2e-tests/cypress/node_modules'
+      #     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('e2e-tests/cypress/package-lock.json') }}-${{ hashFiles('e2e-tests/playwright/package-lock.json') }}
       - name: ci/get-node-modules
         # if: steps.npm-cache.outputs.cache-hit != 'true'
         run: |
           make node_modules
-          # make channels/e2e/playwright/node_modules
+          # make channels/e2e-tests/playwright/node_modules
       - name: ci/build
         run: |
           npm run build

.github/workflows/e2e-tests-ci.yml

@@ -1,4 +1,4 @@
-name: mattermost-e2e
+name: mattermost-e2e-tests
 on:
   pull_request:
   push:
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-22.04
     defaults:
       run:
-        working-directory: e2e/cypress
+        working-directory: e2e-tests/cypress
     steps:
       - name: ci/checkout-repo
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
@@ -26,7 +26,7 @@ jobs:
         with:
           node-version-file: ".nvmrc"
           cache: npm
-          cache-dependency-path: 'e2e/cypress/package-lock.json'
+          cache-dependency-path: 'e2e-tests/cypress/package-lock.json'
       - name: ci/cypress/npm-install
         run: |
           npm ci
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-22.04
     defaults:
       run:
-        working-directory: e2e/playwright
+        working-directory: e2e-tests/playwright
     steps:
       - name: ci/checkout-repo
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
@@ -47,7 +47,7 @@ jobs:
         with:
           node-version-file: ".nvmrc"
           cache: npm
-          cache-dependency-path: 'e2e/playwright/package-lock.json'
+          cache-dependency-path: 'e2e-tests/playwright/package-lock.json'
       - name: ci/get-webapp-node-modules
         working-directory: webapp
         # requires build of client and types

.gitignore

@@ -23,25 +23,25 @@ config/logging.json
 /plugins
 
 # disable folders generated by Cypress
-e2e/cypress/node_modules
-e2e/cypress/tests/downloads
-e2e/cypress/tests/screenshots
-e2e/cypress/tests/videos
-e2e/cypress/tests/integration/benchmark/__benchmarks__
-e2e/cypress/tests/integration/performance/logs
-e2e/cypress/tests/fixtures/ldap_tmp
-e2e/cypress/tests/fixtures/mmctl
-e2e/cypress/results
-e2e/cypress/.eslintcache
+e2e-tests/cypress/node_modules
+e2e-tests/cypress/tests/downloads
+e2e-tests/cypress/tests/screenshots
+e2e-tests/cypress/tests/videos
+e2e-tests/cypress/tests/integration/benchmark/__benchmarks__
+e2e-tests/cypress/tests/integration/performance/logs
+e2e-tests/cypress/tests/fixtures/ldap_tmp
+e2e-tests/cypress/tests/fixtures/mmctl
+e2e-tests/cypress/results
+e2e-tests/cypress/.eslintcache
 
 # disable files/folders generated by Playwright
-e2e/playwright/node_modules
-e2e/playwright/playwright-report
-e2e/playwright/storage_state
-e2e/playwright/test-results
-e2e/playwright/tests/**/*-darwin.png
-e2e/playwright/tests/**/*-window.png
-e2e/playwright/.eslintcache
+e2e-tests/playwright/node_modules
+e2e-tests/playwright/playwright-report
+e2e-tests/playwright/storage_state
+e2e-tests/playwright/test-results
+e2e-tests/playwright/tests/**/*-darwin.png
+e2e-tests/playwright/tests/**/*-window.png
+e2e-tests/playwright/.eslintcache
 
 # Enterprise & products imports files
 imports/imports.go