Skip to content

Commit

Permalink
Merge pull request #7 from math-dojo/ft6
Browse files Browse the repository at this point in the history
Ft6
  • Loading branch information
noce2 authored Jan 7, 2020
2 parents 363e727 + cd4330b commit 6ef2ec6
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 1 deletion.
30 changes: 30 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,36 @@ steps:
npm test
displayName: 'run unit and integration tests'

- script: |
./node_modules/.bin/webdriver-manager update --versions.chrome=77.0.3865.40
displayName: 'add chrome driver to node directory'
condition: |
or(
eq(variables['Build.Reason'], 'PullRequest'),
eq(variables['Build.SourceBranch'], 'refs/heads/master'),
eq(variables['Build.SourceBranch'], 'refs/heads/develop')
)
- script: |
npm run-script e2e
displayName: 'run end-to-end tests'
condition: |
or(
eq(variables['Build.Reason'], 'PullRequest'),
eq(variables['Build.SourceBranch'], 'refs/heads/master'),
eq(variables['Build.SourceBranch'], 'refs/heads/develop')
)
- script: |
npm run-script lint
displayName: 'run linting'
condition: |
or(
eq(variables['Build.Reason'], 'PullRequest'),
eq(variables['Build.SourceBranch'], 'refs/heads/master'),
eq(variables['Build.SourceBranch'], 'refs/heads/develop')
)
- script: |
npm run-script build
displayName: 'npm build'
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"test": "ng test",
"test-local": "ng test --browsers=Chrome --karmaConfig=karma.conf.local.js",
"lint": "ng lint",
"e2e": "ng e2e"
"e2e-local": "ng e2e",
"e2e": "ng e2e --webdriverUpdate=false"
},
"private": true,
"dependencies": {
Expand Down

0 comments on commit 6ef2ec6

Please sign in to comment.