diff options
author | kumavis <aaron@kumavis.me> | 2018-05-17 02:57:07 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2018-05-17 02:57:07 +0800 |
commit | c27d9162d7001fa2bd6cfb98dd110716951d2d1b (patch) | |
tree | 19f5d4780b3ee82c0e9c9fe2a9c2edad745dd084 /.circleci/config.yml | |
parent | a1d13d45cf7451162b071e5507f1e31b12574e6e (diff) | |
parent | 6e79225dbff512ab9bcae2731bcfc4ce33e98664 (diff) | |
download | tangerine-wallet-browser-c27d9162d7001fa2bd6cfb98dd110716951d2d1b.tar.gz tangerine-wallet-browser-c27d9162d7001fa2bd6cfb98dd110716951d2d1b.tar.zst tangerine-wallet-browser-c27d9162d7001fa2bd6cfb98dd110716951d2d1b.zip |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints
Diffstat (limited to '.circleci/config.yml')
-rw-r--r-- | .circleci/config.yml | 57 |
1 files changed, 53 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ed731225..939df8be5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,9 +15,17 @@ workflows: - test-lint: requires: - prep-deps-npm - - test-e2e: + - test-deps: requires: - prep-deps-npm + - test-e2e-chrome: + requires: + - prep-deps-npm + - prep-build + - test-e2e-firefox: + requires: + - prep-deps-npm + - prep-deps-firefox - prep-build - test-unit: requires: @@ -43,8 +51,10 @@ workflows: - all-tests-pass: requires: - test-lint + - test-deps - test-unit - - test-e2e + - test-e2e-chrome + - test-e2e-firefox - test-integration-mascara-chrome - test-integration-mascara-firefox - test-integration-flat-chrome @@ -145,7 +155,18 @@ jobs: name: Test command: npm run lint - test-e2e: + test-deps: + docker: + - image: circleci/node:8-browsers + steps: + - checkout + - restore_cache: + key: dependency-cache-{{ .Revision }} + - run: + name: Test + command: npx nsp check + + test-e2e-chrome: docker: - image: circleci/node:8-browsers steps: @@ -156,7 +177,34 @@ jobs: key: build-cache-{{ .Revision }} - run: name: Test - command: npm run test:e2e + command: npm run test:e2e:chrome + - store_artifacts: + path: test-artifacts + destination: test-artifacts + + test-e2e-firefox: + environment: + browsers: '["Firefox"]' + docker: + - image: circleci/node:8-browsers + steps: + - checkout + - restore_cache: + key: dependency-cache-firefox-{{ .Revision }} + - run: + name: Install firefox + command: > + sudo rm -r /opt/firefox + && sudo mv firefox /opt/firefox58 + && sudo mv /usr/bin/firefox /usr/bin/firefox-old + && sudo ln -s /opt/firefox58/firefox /usr/bin/firefox + - restore_cache: + key: dependency-cache-{{ .Revision }} + - restore_cache: + key: build-cache-{{ .Revision }} + - run: + name: test:e2e:firefox + command: npm run test:e2e:firefox - store_artifacts: path: test-artifacts destination: test-artifacts @@ -320,3 +368,4 @@ jobs: - run: name: All Tests Passed command: echo 'weew - everything passed!' +
\ No newline at end of file |