Removed part2 sh files and changed command to run circle ci split test

ci/browser_tests_chrome_part1.sh → ci/browser_tests_chrome.sh

@@ -21,16 +21,8 @@ setupRemixd
 
 sleep 5
 
-npm run nightwatch_local_libraryDeployment || TEST_EXITCODE=1
-npm run nightwatch_local_solidityImport || TEST_EXITCODE=1
-npm run nightwatch_local_recorder || TEST_EXITCODE=1
-npm run nightwatch_local_transactionExecution || TEST_EXITCODE=1
-npm run nightwatch_local_staticAnalysis || TEST_EXITCODE=1
-npm run nightwatch_local_signingMessage || TEST_EXITCODE=1
-npm run nightwatch_local_specialFunctions || TEST_EXITCODE=1
-npm run nightwatch_local_solidityUnitTests || TEST_EXITCODE=1
-npm run nightwatch_local_remixd || TEST_EXITCODE=1
-npm run nightwatch_local_terminal || TEST_EXITCODE=1
+TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
+npm run nightwatch $TESTFILES
 
 echo "$TEST_EXITCODE"
 if [ "$TEST_EXITCODE" -eq 1 ]

ci/browser_tests_chrome_part2.sh → ci/browser_tests_firefox.sh

@@ -21,16 +21,8 @@ setupRemixd
 
 sleep 5
 
-npm run nightwatch_local_generalSettings || TEST_EXITCODE=1
-npm run nightwatch_local_ballot || TEST_EXITCODE=1
-npm run nightwatch_local_gist || TEST_EXITCODE=1
-npm run nightwatch_local_workspace || TEST_EXITCODE=1
-npm run nightwatch_local_defaultLayout || TEST_EXITCODE=1
-npm run nightwatch_local_pluginManager || TEST_EXITCODE=1
-npm run nightwatch_local_publishContract || TEST_EXITCODE=1
-npm run nightwatch_local_fileExplorer || TEST_EXITCODE=1
-npm run nightwatch_local_debugger || TEST_EXITCODE=1
-npm run nightwatch_local_editor || TEST_EXITCODE=1
+TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
+npm run nightwatch $TESTFILES
 
 echo "$TEST_EXITCODE"
 if [ "$TEST_EXITCODE" -eq 1 ]

ci/browser_tests_firefox_part1.sh

-#!/usr/bin/env bash
-
-set -e
-
-setupRemixd () {
-  mkdir remixdSharedfolder
-  cd contracts
-  echo 'sharing folder: '
-  echo $PWD
-  ./../node_modules/remixd/bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
-  cd ..
-}
-
-BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}}
-echo "$BUILD_ID"
-TEST_EXITCODE=0
-
-npm run ganache-cli &
-npm run serve &
-setupRemixd
-
-sleep 5
-
-npm run nightwatch_local_libraryDeployment_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_solidityImport_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_recorder_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_transactionExecution_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_staticAnalysis_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_signingMessage_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_specialFunctions_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_solidityUnitTests_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_remixd_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_terminal_firefox || TEST_EXITCODE=1
-
-echo "$TEST_EXITCODE"
-if [ "$TEST_EXITCODE" -eq 1 ]
-then
-  exit 1
-fi

ci/browser_tests_firefox_part2.sh

-#!/usr/bin/env bash
-
-set -e
-
-setupRemixd () {
-  mkdir remixdSharedfolder
-  cd contracts
-  echo 'sharing folder: '
-  echo $PWD
-  ./../node_modules/remixd/bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
-  cd ..
-}
-
-BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}}
-echo "$BUILD_ID"
-TEST_EXITCODE=0
-
-npm run ganache-cli &
-npm run serve &
-setupRemixd
-
-sleep 5
-
-npm run nightwatch_local_generalSettings_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_ballot_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_gist_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_workspace_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_defaultLayout_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_pluginManager_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_publishContract_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_fileExplorer_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_debugger_firefox || TEST_EXITCODE=1
-npm run nightwatch_local_editor_firefox || TEST_EXITCODE=1
-
-echo "$TEST_EXITCODE"
-if [ "$TEST_EXITCODE" -eq 1 ]
-then
-  exit 1
-fi