diff --git a/apps/remix-ide/ci/browser_tests.sh b/apps/remix-ide/ci/browser_tests.sh index fe7776d919..a912d3fb52 100755 --- a/apps/remix-ide/ci/browser_tests.sh +++ b/apps/remix-ide/ci/browser_tests.sh @@ -22,7 +22,7 @@ setupRemixd sleep 5 npm run nightwatch_parallel || TEST_EXITCODE=1 -TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings) +TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings) for TESTFILE in $TESTFILES; do ./node_modules/.bin/nightwatch --config nightwatch.js --env chrome $TESTFILE || TEST_EXITCODE=1 done diff --git a/apps/remix-ide/ci/browser_tests_chrome.sh b/apps/remix-ide/ci/browser_tests_chrome.sh index 02ecb17e58..ae89cabae6 100755 --- a/apps/remix-ide/ci/browser_tests_chrome.sh +++ b/apps/remix-ide/ci/browser_tests_chrome.sh @@ -4,11 +4,11 @@ set -e setupRemixd () { mkdir remixdSharedfolder - cd contracts + cd apps/remix-ide/contracts echo 'sharing folder: ' echo $PWD - ./../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 & - cd .. + ../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:4200 & + cd ../../.. } BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}} @@ -21,9 +21,9 @@ setupRemixd sleep 5 -TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings) +TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings) for TESTFILE in $TESTFILES; do - ./node_modules/.bin/nightwatch --config nightwatch.js --env chrome $TESTFILE || TEST_EXITCODE=1 + ./node_modules/.bin/nightwatch --config ./apps/remix-ide/nightwatch.js --env chrome $TESTFILE || TEST_EXITCODE=1 done echo "$TEST_EXITCODE" diff --git a/apps/remix-ide/ci/browser_tests_firefox.sh b/apps/remix-ide/ci/browser_tests_firefox.sh index 5e49e4a29d..5174bedc87 100755 --- a/apps/remix-ide/ci/browser_tests_firefox.sh +++ b/apps/remix-ide/ci/browser_tests_firefox.sh @@ -23,7 +23,7 @@ sleep 5 TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings) for TESTFILE in $TESTFILES; do - ./node_modules/.bin/nightwatch --config nightwatch.js --env firefox $TESTFILE || TEST_EXITCODE=1 + ./node_modules/.bin/nightwatch --config ./apps/remix-ide/nightwatch.js --env firefox $TESTFILE || TEST_EXITCODE=1 done echo "$TEST_EXITCODE"