diff options
| author | Whymarrh Whitby <whymarrh.whitby@gmail.com> | 2019-02-20 21:57:49 +0800 |
|---|---|---|
| committer | Whymarrh Whitby <whymarrh.whitby@gmail.com> | 2019-02-21 01:50:39 +0800 |
| commit | 38bb1d39792d8e4c238f7528990d725527379550 (patch) | |
| tree | 103ba5c5b51d4578e03e191fcbaee2d81dbd7000 | |
| parent | 3658ca550af2573a7abb729591f3645ec8b48d54 (diff) | |
| download | tangerine-wallet-browser-38bb1d39792d8e4c238f7528990d725527379550.tar tangerine-wallet-browser-38bb1d39792d8e4c238f7528990d725527379550.tar.gz tangerine-wallet-browser-38bb1d39792d8e4c238f7528990d725527379550.tar.bz2 tangerine-wallet-browser-38bb1d39792d8e4c238f7528990d725527379550.tar.lz tangerine-wallet-browser-38bb1d39792d8e4c238f7528990d725527379550.tar.xz tangerine-wallet-browser-38bb1d39792d8e4c238f7528990d725527379550.tar.zst tangerine-wallet-browser-38bb1d39792d8e4c238f7528990d725527379550.zip | |
Remove unused CI jobs, rename e2e beta jobs
| -rw-r--r-- | .circleci/config.yml | 20 | ||||
| -rw-r--r-- | package.json | 8 |
2 files changed, 12 insertions, 16 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 451a630bb..cf5afc3a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,11 +20,11 @@ workflows: # - test-deps: # requires: # - prep-deps-npm - - test-e2e-beta-chrome: + - test-e2e-chrome: requires: - prep-deps-npm - prep-build - - test-e2e-beta-firefox: + - test-e2e-firefox: requires: - prep-deps-npm - prep-build @@ -52,8 +52,8 @@ workflows: - test-lint - test-unit - test-mozilla-lint - - test-e2e-beta-chrome - - test-e2e-beta-firefox + - test-e2e-chrome + - test-e2e-firefox # - test-e2e-beta-drizzle - test-integration-flat-chrome - test-integration-flat-firefox @@ -189,7 +189,7 @@ jobs: # - store_artifacts: # path: test-artifacts # destination: test-artifacts - test-e2e-beta-chrome: + test-e2e-chrome: docker: - image: circleci/node:8.11.3-browsers steps: @@ -197,13 +197,13 @@ jobs: - attach_workspace: at: . - run: - name: test:e2e:chrome:beta - command: npm run test:e2e:chrome:beta + name: test:e2e:chrome + command: npm run test:e2e:chrome - store_artifacts: path: test-artifacts destination: test-artifacts - test-e2e-beta-firefox: + test-e2e-firefox: docker: - image: circleci/node:8.11.3-browsers steps: @@ -214,8 +214,8 @@ jobs: - attach_workspace: at: . - run: - name: test:e2e:firefox:beta - command: npm run test:e2e:firefox:beta + name: test:e2e:firefox + command: npm run test:e2e:firefox - store_artifacts: path: test-artifacts destination: test-artifacts diff --git a/package.json b/package.json index 02dc3278c..f5600d019 100644 --- a/package.json +++ b/package.json @@ -15,13 +15,9 @@ "test:single": "cross-env METAMASK_ENV=test mocha --require test/helper.js", "test:integration": "npm run test:integration:build && npm run test:flat && npm run test:mascara", "test:integration:build": "gulp build:scss", - "test:e2e:chrome": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run:chrome'", "test:e2e:drizzle:beta": "SELENIUM_BROWSER=chrome test/e2e/beta/run-drizzle.sh", - "test:e2e:chrome:beta": "SELENIUM_BROWSER=chrome test/e2e/beta/run-all.sh", - "test:e2e:firefox": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run:firefox'", - "test:e2e:firefox:beta": "SELENIUM_BROWSER=firefox test/e2e/beta/run-all.sh", - "test:e2e:run:chrome": "SELENIUM_BROWSER=chrome mocha test/e2e/metamask.spec --bail --recursive", - "test:e2e:run:firefox": "SELENIUM_BROWSER=firefox mocha test/e2e/metamask.spec --bail --recursive", + "test:e2e:chrome": "SELENIUM_BROWSER=chrome test/e2e/beta/run-all.sh", + "test:e2e:firefox": "SELENIUM_BROWSER=firefox test/e2e/beta/run-all.sh", "test:screens": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:screens:run'", "test:screens:run": "node test/screens/new-ui.js", "test:coverage": "nyc --reporter=text --reporter=html npm run test:unit && npm run test:coveralls-upload", |