From 937e8cb31ec9a9c541dbf9a7126002e3d0ba15e0 Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Mon, 15 Jun 2020 12:10:57 +0100 Subject: [PATCH] Debug ci Debug ci Debug ci Debug ci Debug ci Debug ci Debug ci Debug ci Debug ci Debug ci Debug ci Debug ci Debug ci Debug ci Debug ci false positive"# --- ci/browser_tests_chrome.sh | 5 ++++- ci/browser_tests_firefox.sh | 5 ++++- test-browser/helpers/init.js | 8 ++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ci/browser_tests_chrome.sh b/ci/browser_tests_chrome.sh index fe356be28b..1fa610d844 100755 --- a/ci/browser_tests_chrome.sh +++ b/ci/browser_tests_chrome.sh @@ -22,7 +22,10 @@ setupRemixd sleep 5 TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings) -npm run nightwatch_local_chrome ${TESTFILES || exit 1;} +ls +for TESTFILE in $TESTFILES; do + ./node_modules/.bin/nightwatch --config nightwatch.js --env chrome $TESTFILE || exit 1; +done echo "$TEST_EXITCODE" if [ "$TEST_EXITCODE" -eq 1 ] diff --git a/ci/browser_tests_firefox.sh b/ci/browser_tests_firefox.sh index be90222fee..a5c5fa3b0a 100755 --- a/ci/browser_tests_firefox.sh +++ b/ci/browser_tests_firefox.sh @@ -22,7 +22,10 @@ setupRemixd sleep 5 TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings) -npm run nightwatch_local_firefox ${TESTFILES || exit 1;} +ls +for TESTFILE in $TESTFILES; do + ./node_modules/.bin/nightwatch --config nightwatch.js --env firefox $TESTFILE || exit 1; +done echo "$TEST_EXITCODE" if [ "$TEST_EXITCODE" -eq 1 ] diff --git a/test-browser/helpers/init.js b/test-browser/helpers/init.js index c4341a362b..1d01999473 100644 --- a/test-browser/helpers/init.js +++ b/test-browser/helpers/init.js @@ -14,11 +14,11 @@ module.exports = function (browser, callback, url, preloadPlugins = true) { .execute(() => { document.getElementById('autoCompile').click() }) - .perform(function () { - callback() - }) }) - } else callback() + } + }) + .perform(()=>{ + callback() }) }) }