refactor: make names consistant across dev-stock

pondersource · Mar 6, 2024 · c56e703 · c56e703
1 parent 794d692
commit c56e703
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ocm-test-suite.yml b/.github/workflows/ocm-test-suite.yml
@@ -47,4 +47,4 @@ jobs:
         if: ${{ matrix.record }}
         with:
           name: cypress-videos
-          path: ./cypress/ocm-tests/cypress/videos
+          path: ./cypress/ocm-test-suite/cypress/videos
diff --git a/.gitignore b/.gitignore
@@ -25,4 +25,4 @@ surf-trashbin-app
 oc-sciencemesh-release
 nc-sciencemesh-release
 surf-token-based-access
-cypress/ocm-tests/cypress/videos/*
+cypress/ocm-test-suite/cypress/videos/*
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ ocm-test-suite:
     - ./dev/ocm-test-suite.sh ci $BROWSER
   artifacts:
     paths:
-      - ./cypress/ocm-tests/cypress/videos
+      - ./cypress/ocm-test-suite/cypress/videos
     expire_in: 1 week
   rules:
   - if: '$CI_COMMIT_BRANCH == "main"'

diff --git a/cypress/ocm-tests/cypress.config.js → cypress/ocm-test-suite/cypress.config.js b/cypress/ocm-tests/cypress.config.js → cypress/ocm-test-suite/cypress.config.js
diff --git a/...m-tests/cypress/e2e/login/nextcloud.cy.js → ...t-suite/cypress/e2e/login/nextcloud.cy.js b/...m-tests/cypress/e2e/login/nextcloud.cy.js → ...t-suite/cypress/e2e/login/nextcloud.cy.js
diff --git a/...cm-tests/cypress/e2e/login/owncloud.cy.js → ...st-suite/cypress/e2e/login/owncloud.cy.js b/...cm-tests/cypress/e2e/login/owncloud.cy.js → ...st-suite/cypress/e2e/login/owncloud.cy.js
diff --git a/.../ocm-tests/cypress/e2e/share/federated.js → ...test-suite/cypress/e2e/share/federated.js b/.../ocm-tests/cypress/e2e/share/federated.js → ...test-suite/cypress/e2e/share/federated.js
diff --git a/...s/ocm-tests/cypress/fixtures/example.json → ...-test-suite/cypress/fixtures/example.json b/...s/ocm-tests/cypress/fixtures/example.json → ...-test-suite/cypress/fixtures/example.json
diff --git a/...ess/ocm-tests/cypress/support/commands.js → ...cm-test-suite/cypress/support/commands.js b/...ess/ocm-tests/cypress/support/commands.js → ...cm-test-suite/cypress/support/commands.js
diff --git a/cypress/ocm-tests/cypress/support/e2e.js → ...ess/ocm-test-suite/cypress/support/e2e.js b/cypress/ocm-tests/cypress/support/e2e.js → ...ess/ocm-test-suite/cypress/support/e2e.js
diff --git a/dev/ocm-test-suite.sh b/dev/ocm-test-suite.sh
@@ -291,7 +291,7 @@ if [ "${SCRIPT_MODE}" = "dev" ]; then
   docker run --detach --network=testnet                                                                     \
     --name="cypress.docker"                                                                                 \
     -e DISPLAY=vnc-server:0.0                                                                               \
-    -v "${ENV_ROOT}/cypress/ocm-tests:/ocm"                                                                 \
+    -v "${ENV_ROOT}/cypress/ocm-test-suite:/ocm"                                                            \
     -v "${ENV_ROOT}/temp/.X11-unix:/tmp/.X11-unix"                                                          \
     -w /ocm                                                                                                 \
     --entrypoint cypress                                                                                    \
@@ -317,7 +317,7 @@ else
   # run Cypress test suite headlessly and with the defined browser.
   docker run --network=testnet                                                  \
     --name="cypress.docker"                                                     \
-    -v "${ENV_ROOT}/cypress/ocm-tests:/ocm"                                     \
+    -v "${ENV_ROOT}/cypress/ocm-test-suite:/ocm"                                \
     -w /ocm                                                                     \
     cypress/included:13.3.0 cypress run --browser "${TEST_PLATFORM}"
 fi