diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-02 05:41:34 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-02 05:41:34 +0800 |
| commit | 1494cc5e6c5943095c89e3b243b0a6152876e72c (patch) | |
| tree | e34e74e79e8d41ce5903cc8d6eedf5caa19bc354 /test/e2e/beta/run-all.sh | |
| parent | 6e563acd93cbaf20fb233a267104fc6af3384287 (diff) | |
| parent | b2e64f24ecbc9e309869e678254cf755ffe11b40 (diff) | |
| download | tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.gz tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.bz2 tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.lz tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.xz tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.zst tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.zip | |
fix merge conflicts
Diffstat (limited to 'test/e2e/beta/run-all.sh')
| -rwxr-xr-x | test/e2e/beta/run-all.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/e2e/beta/run-all.sh b/test/e2e/beta/run-all.sh index 5916d5614..493e1360a 100755 --- a/test/e2e/beta/run-all.sh +++ b/test/e2e/beta/run-all.sh @@ -6,5 +6,5 @@ set -o pipefail export PATH="$PATH:./node_modules/.bin" -shell-parallel -s 'npm run ganache:start' -x 'sleep 5 && mocha test/e2e/beta/metamask-beta-ui.spec' -shell-parallel -s 'npm run ganache:start' -x 'sleep 5 && mocha test/e2e/beta/from-import-beta-ui.spec' +shell-parallel -s 'npm run ganache:start' -x 'sleep 5 && superstatic test/e2e/beta/contract-test/ --port 8080 --host 127.0.0.1' -x 'sleep 5 && mocha test/e2e/beta/metamask-beta-ui.spec' +shell-parallel -s 'npm run ganache:start -- -d' -x 'sleep 5 && superstatic test/e2e/beta/contract-test/ --port 8080 --host 127.0.0.1' -x 'sleep 5 && mocha test/e2e/beta/from-import-beta-ui.spec' |