fix build

.circleci/config.yml

@@ -46,13 +46,14 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - dep-bundle-3-{{ checksum "package.json" }}
+            - dep-bundle-4-{{ checksum "package.json" }}
       - run: npm install
       - save_cache:
-          key: dep-bundle-3-{{ checksum "package.json" }}
+          key: dep-bundle-4-{{ checksum "package.json" }}
           paths:
             - ~/repo/node_modules
-      - run: cd src/app/debugger/remix-debugger && ./ci/browser_tests.sh
+      - run: npm run build_debugger
+      - run: ./ci/browser_tests_debugger.sh
 
 workflows:
   version: 2

src/app/debugger/remix-debugger/ci/browser_tests.sh → ci/browser_tests_debugger.sh

@@ -19,7 +19,6 @@ SAUCECONNECT_JOBIDENTIFIER="remix_tests_${BUILD_ID}"
 SAUCECONNECT_READYFILE="sc.ready"
 TEST_EXITCODE=0
 
-npm install && npm run build
 npm run serve &
 
 wget $SAUCECONNECT_URL
@@ -29,7 +28,7 @@ while [ ! -f $SAUCECONNECT_READYFILE ]; do
   sleep .5
 done
 
-npm run nightwatch_remote_parallel || TEST_EXITCODE=1
+npm run nightwatch_remote_debugger_parallel || TEST_EXITCODE=1
 
 node ci/sauceDisconnect.js $SAUCECONNECT_USERNAME $SAUCECONNECT_ACCESSKEY $SAUCECONNECT_JOBIDENTIFIER
 

src/app/debugger/remix-debugger/nightwatch.js → nightwatch_debugger.js

@@ -2,8 +2,8 @@
 var buildId = process.env.CIRCLE_BUILD_NUM || process.env.TRAVIS_JOB_NUMBER
 
 module.exports = {
-  'src_folders': ['./test-browser/test'],
-  'output_folder': './test-browser/test/reports',
+  'src_folders': ['./test-browser-debugger/test'],
+  'output_folder': './test-browser-debugger/test/reports',
   'custom_commands_path': '',
   'custom_assertions_path': '',
   'globals_path': '',

package.json

@@ -142,6 +142,7 @@
     "linkremixsolidity": "cd node_modules && rm -rf remix-solidity && ln -s ../remix/remix-solidity remix-solidity && cd ..",
     "linkremixdebugger": "cd node_modules && rm -rf remix-debugger && ln -s ../remix/remix-debugger remix-debugger && cd ..",
     "build": "browserify src/index.js -o build/app.js",
+    "build_debugger": "browserify src/app/debugger/remix-debugger/index.js -o src/app/debugger/remix-debugger/build/app.js",
     "browsertest": "sleep 5 && npm run nightwatch_local",
     "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='assets/css/font-awesome.min.css' assets/css/",
     "downloadsolc": "rimraf soljson.js && cd node_modules/solc && wget --no-check-certificate https://solc-bin.ethereum.org/soljson.js && cd ../../",
@@ -154,13 +155,15 @@
     "nightwatch_remote_firefox": "nightwatch --config nightwatch.js --env default",
     "nightwatch_remote_ie": "nightwatch --config nightwatch.js --env ie",
     "nightwatch_remote_parallel": "nightwatch --config nightwatch.js --env safari,chrome,default",
-    "nightwatch_remote_safari": "nightwatch --config nightwatch.js --env safari",
+    "nightwatch_remote_safari": "nightwatch --config nightwatch.js --env safari",    
+    "nightwatch_remote_debugger_parallel": "nightwatch --config nightwatch_debugger.js --env local",
     "onchange": "onchange build/app.js -- npm-run-all lint",
     "prepublish": "mkdirp build; npm-run-all -ls downloadsolc_root build",
     "remixd": "node ./node_modules/remixd/src/main.js -s ./contracts",
     "selenium": "execr --silent selenium-standalone start",
     "selenium-install": "selenium-standalone install",
     "serve": "execr --silent http-server .",
+    "serve_debugger": "execr --silent http-server src/app/debugger/remix-debugger",
     "sourcemap": "exorcist --root ../ build/app.js.map > build/app.js",
     "start": "npm-run-all -lpr serve watch onchange remixd",
     "test": "npm run csslint; standard && node test/index.js",