Skip to content

Fix Protractor tests #4

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

Merged
merged 31 commits into from
Jun 14, 2018
Merged

Fix Protractor tests #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
11426fc
Add npm install
Jun 12, 2018
2c4d11c
Fix Protractor tests
Jun 13, 2018
f871331
Don't run mvn verify since ITs aren't passing yet
Jun 13, 2018
f0a9539
Navigate back to root after npm install
Jun 13, 2018
e24af07
npm install seems to happen automatically
Jun 13, 2018
0b58bac
Make Travis match pom.xml node version
Jun 13, 2018
accdf31
npm install does need to happen manually
Jun 13, 2018
de943dd
Upgrade serve and sleep after starting Spring Boot
Jun 13, 2018
8a3ebec
Install serve globall since it doesn't work as a dev dependency
Jun 13, 2018
5720aa9
Lock down version of serve
Jun 13, 2018
cb8ab69
Increase startup to 45s
Jun 13, 2018
efbe179
Switch from using serve to node-http-server
Jun 13, 2018
7ca6564
Run prod build before e2e tests
Jun 13, 2018
46b3ff5
Don't use node-http-server b/c it won't proxy /api
Jun 13, 2018
36e8b00
Run e2e from crypto-pwa directory
Jun 13, 2018
7154ba3
Sleep before running e2e tests
Jun 13, 2018
4d896f9
Fix tests and allow Protractor to run against 8100, or 8080 for Travis
Jun 13, 2018
e85317d
Add browser sleep for 1s
Jun 13, 2018
5d80f73
Regenerate Travis variables for repo using:
Jun 13, 2018
810377a
Add scopes to Spring Security config so its possible to switch to Spr…
Jun 13, 2018
abc447f
Try Spring Security starter
Jun 13, 2018
16f4ffe
Refactor logout
Jun 13, 2018
368535a
Try Spring security again
Jun 13, 2018
a1899f5
Crank up the debugging
Jun 13, 2018
88c6329
Restart browser as a workaround for not fully logged out
Jun 13, 2018
72c2782
Restart browser as a workaround for not fully logged out
Jun 13, 2018
124e084
Merge branch 'fix-protractor-tests' of github.com:oktadeveloper/okta-…
Jun 13, 2018
9514802
Comment out Spring Security logging
Jun 13, 2018
87b89e8
Add SSO logout and remove browser.restart()
Jun 14, 2018
9e6a664
Use mvn -q verify instead of tests to prepare for merge with Java IT …
Jun 14, 2018
2dd7d4a
Fixes based on combined PR https://github.com/oktadeveloper/okta-spri…
Jun 14, 2018
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
Prev Previous commit
Next Next commit
Upgrade serve and sleep after starting Spring Boot
  • Loading branch information
Matt Raible committed Jun 13, 2018
commit de943ddb3c4923c3a938ba9291674096e72b021f
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ script:
- cd $TRAVIS_BUILD_DIR
- chmod +x holdings-api/mvnw
- cd holdings-api && ./mvnw -q test # todo: change back to mvnw -q verify
- ./mvnw clean package -Pprod -DskipTests
- ./mvnw -q clean package -Pprod -DskipTests
- java -jar target/*.jar &
- sleep 30s
- cd ../crypto-pwa
- npm run e2e
notifications:
Expand Down
2 changes: 1 addition & 1 deletion crypto-pwa/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"jest-preset-angular": "5.2.1",
"null-loader": "0.1.1",
"protractor": "5.3.1",
"serve": "^6.5.6",
"serve": "^8.2.0",
"ts-loader": "4.2.0",
"ts-node": "6.0.0",
"typescript": "2.8.3"
Expand Down