diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-08-08 14:32:35 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-08-08 14:32:35 +0800 |
| commit | 2e0916d8ff17c89147005d22e8c100113aaf3360 (patch) | |
| tree | c65e20274296658c753e40619eb5cfe0062dc12d /test/e2e/beta/run-all.sh | |
| parent | ef9435e3d0036af1358bb2a5faec5ce69ef159e7 (diff) | |
| parent | aab6e366c5162a85ae7853f5da29321f3d767cf4 (diff) | |
| download | tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar.gz tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar.zst tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.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 493e1360a..7da61e504 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 && 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' +shell-parallel -s 'npm run ganache:start' -x 'sleep 5 && static-server test/e2e/beta/contract-test/ --port 8080' -x 'sleep 5 && mocha test/e2e/beta/metamask-beta-ui.spec' +shell-parallel -s 'npm run ganache:start -- -d' -x 'sleep 5 && static-server test/e2e/beta/contract-test/ --port 8080' -x 'sleep 5 && mocha test/e2e/beta/from-import-beta-ui.spec' |