From 073a763ca9276e0b7d0d0a7331eb902978623b1b Mon Sep 17 00:00:00 2001 From: Scott Cytacki Date: Fri, 13 Sep 2024 09:59:28 -0400 Subject: [PATCH] decrease Cypress timeout when running locally --- cypress/config/cypress.dev.json | 4 ---- cypress/config/cypress.local.json | 3 ++- cypress/run_cypress_test.sh | 19 ------------------- package.json | 1 - 4 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 cypress/config/cypress.dev.json delete mode 100755 cypress/run_cypress_test.sh diff --git a/cypress/config/cypress.dev.json b/cypress/config/cypress.dev.json deleted file mode 100644 index 2aafc67ebb..0000000000 --- a/cypress/config/cypress.dev.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "baseUrl": "http://localhost:8080/" -} - diff --git a/cypress/config/cypress.local.json b/cypress/config/cypress.local.json index d36314102c..00ea18a126 100644 --- a/cypress/config/cypress.local.json +++ b/cypress/config/cypress.local.json @@ -1,4 +1,5 @@ { "baseUrl": "http://localhost:8080/", - "hideXHRInCommandLog": true + "hideXHRInCommandLog": true, + "defaultCommandTimeout": 5000 } diff --git a/cypress/run_cypress_test.sh b/cypress/run_cypress_test.sh deleted file mode 100755 index 47fe7341ab..0000000000 --- a/cypress/run_cypress_test.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -declare -a BRANCH_ARRAY=("master" "production" "dataflow" "dataflow_production") - -npm run start & -wait-on http://localhost:8080 -echo "start TRAVIS_BRANCH=$TRAVIS_BRANCH" -if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[dev-build]"* ]]; then - echo "dev-build" - npm run test:cypress:smoke -elif !(echo $BRANCH_ARRAY | grep -q $TRAVIS_BRANCH); then - echo "elif TRAVIS_BRANCH=$TRAVIS_BRANCH" - npm run test:cypress:branch -else - echo "else TRAVIS_BRANCH=$TRAVIS_BRANCH" - npm run test:cypress:ci -fi - - \ No newline at end of file diff --git a/package.json b/package.json index 72a0dd5a2b..040e8f2011 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,6 @@ "test:coverage:watch": "jest --coverage --watchAll", "test:coverage:cypress:open": "cypress open --env coverage=true", "test:cypress": "cypress run --env testEnv=local", - "test:cypress:ci": "cypress run --env testEnv=local --record", "test:cypress:open": "cypress open --env testEnv=local", "test:cypress:open:disable-gpu": "cross-env ELECTRON_EXTRA_LAUNCH_ARGS=--disable-gpu cypress open --env testEnv=local", "test:cypress:smoke": "cypress run --spec 'cypress/e2e/smoke/single_student_canvas_test.js' --env testEnv=local",