Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ft6 #7

Merged
merged 11 commits into from
Jan 7, 2020
Merged

Ft6 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0d81381
Add conditional step for linting and e2e in cicd
noce2 Dec 23, 2019
adac8da
Add chrome driver for selenium to path
noce2 Dec 24, 2019
a0d20b3
Add chromedriver to env in same task
noce2 Dec 24, 2019
2fe3cc4
Echo chromedrive path location
noce2 Dec 24, 2019
de75a6c
Fix variable name syntax
noce2 Dec 24, 2019
2ccde3d
Use .bat syntax to add chromedriver to path
noce2 Dec 24, 2019
fe5a0b6
Correct log prepend path command
noce2 Dec 24, 2019
f63adba
Manually install correct chrome driver for az devops
noce2 Dec 24, 2019
3886c19
Make webdriver stage separate
noce2 Dec 24, 2019
3a6617a
Separate linting and e2e steps
noce2 Dec 24, 2019
cd4330b
Merge branch 'develop' into ft6
noce2 Jan 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions azure-pipelines.yml
View file
Open in desktop
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
View file
Open in desktop
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