This commit is contained in:
Wyatt Johnson
2018-02-28 12:10:42 -07:00
parent 6e20a43e29
commit 30271ac945
2 changed files with 17 additions and 5 deletions
+15 -3
View File
@@ -33,7 +33,7 @@ integration_job: &integration_job
version: 2
jobs:
# npm_dependencies will install the dependancies used by all other steps.
# npm_dependencies will install the dependencies used by all other steps.
npm_dependencies:
<<: *job_defaults
steps:
@@ -43,7 +43,7 @@ jobs:
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run:
name: Install dependancies
name: Install dependencies
command: |
yarn global add node-gyp &&
yarn install --frozen-lockfile
@@ -156,6 +156,15 @@ jobs:
BROWSERSTACK: true
E2E_BROWSERS: edge
# test_integration_ie will run the integration tests with ie in
# browserstack.
test_integration_ie:
<<: *integration_job
environment:
<<: *integration_environment
BROWSERSTACK: true
E2E_BROWSERS: ie
# test_integration_safari will run the integration tests with safari in
# browserstack.
test_integration_safari:
@@ -250,6 +259,10 @@ workflows:
<<: *filter_deploy
requires:
- build_assets
- test_integration_ie:
<<: *filter_deploy
requires:
- build_assets
- test_integration_safari:
<<: *filter_deploy
requires:
@@ -259,7 +272,6 @@ workflows:
requires:
- lint
- test_unit
- test_integration_safari
- test_integration_chrome
- test_integration_firefox
- test_integration_edge
+2 -2
View File
@@ -51,8 +51,8 @@ module.exports = {
},
'firefox-headless': {
desiredCapabilities: {
chromeOptions: {
args: ['--headless', '--disable-gpu', 'window-size=1600,1200'],
'moz:firefoxOptions': {
args: ['-headless'],
},
},
},