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

Develop #41

Merged
merged 243 commits into from
Feb 1, 2019
Merged

Develop #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
243 commits
Select commit Hold shift + click to select a range
f4aed56
intitial Katalon automated testing commit
Dec 11, 2018
10472e6
travis for katalon integration tests
Dec 11, 2018
fe5b1d9
travis tar tweak
Dec 11, 2018
04a4e9e
run tests
Dec 11, 2018
6c7a58e
tweak to run tests it complained about bin/bash
Dec 11, 2018
1d7b8b6
fixed line endings and project definition for automated tests
BrandonSharratt Dec 11, 2018
32cb654
removed shebang as travis doesn't seem to have bin/bash
BrandonSharratt Dec 11, 2018
4fc101a
added more time for things to load in automated test
Dec 11, 2018
968a279
Merge branch 'feature/testing' of https://github.com/bcgov/OCWA.git i…
Dec 11, 2018
f9ab7e3
travis tweaks
BrandonSharratt Dec 11, 2018
42573ad
added Travis testing url via Profile
Dec 11, 2018
728d0b0
Merge branch 'feature/testing' of https://github.com/bcgov/OCWA.git i…
Dec 11, 2018
1f09d2b
start ignoring local default profile
Dec 11, 2018
20c09e6
added pip to integration test travis
BrandonSharratt Dec 11, 2018
648be89
Merge branch 'feature/testing' of https://github.com/bcgov/OCWA into …
BrandonSharratt Dec 11, 2018
9f57462
changed how katalon studios is run:
BrandonSharratt Dec 11, 2018
252e945
added bin and Lib folders to repo (which apparently we need)
Dec 11, 2018
6eb33d9
Merge branch 'feature/testing' of https://github.com/bcgov/OCWA.git i…
Dec 11, 2018
7e86216
added some classes we need to run Katalon studio scripts successfully
Dec 12, 2018
e018f01
same comment as previous commit
Dec 12, 2018
b070409
Commented out the the GlobalVariable class reference
Dec 12, 2018
dfbb9e2
changed the path from backslashes to forward slashes
Dec 12, 2018
db82204
updated the version of Katalon Studio to install to 5.9.0
Dec 13, 2018
2232ae7
fixed path issue with installing Katalon
Dec 13, 2018
d4c27dc
printout the classpath file
Dec 13, 2018
3b18060
Add a test suite to debug the Katalon integration
Dec 14, 2018
aa8b5ad
update the travis file to call the new test testsuite
Dec 14, 2018
833feb5
added execution permission to the testing sh file
Dec 14, 2018
148b3e5
fixed path for chmod-ing the testing sh file
Dec 14, 2018
3d1137d
added display setting to deal with X11 error when running test suite
Dec 14, 2018
8d609bd
travis tweaks
BrandonSharratt Dec 14, 2018
7973386
running katalon with sudo because chrome needs to bind a port apparently
BrandonSharratt Dec 14, 2018
4f07278
attempting to fix sudo environment vars
BrandonSharratt Dec 14, 2018
04da83f
Added build stages
BrandonSharratt Dec 14, 2018
3509453
changed how xvfb is run and installed chrome
BrandonSharratt Dec 14, 2018
182d217
tweaked how xvfb is used
BrandonSharratt Dec 14, 2018
073ecdd
testing testsuite seemed to work so switching back to cucumber test
Dec 15, 2018
f670603
remove change directory command to
Dec 17, 2018
05112f5
adding to the classpath to resolve missing class errors
Dec 17, 2018
b4b731e
katalon needs openjdk 8 so install it
BrandonSharratt Dec 17, 2018
a6add4d
try an expanded non-cucumber test
Dec 17, 2018
a5f30fe
fix testing url bug; leaner travis build for testing integration
Dec 17, 2018
e2926cd
a minimal cucumber test
Dec 17, 2018
f4d1bac
explicitly provide the failure handling approach
Dec 17, 2018
2cd9f07
simpliest cucumber test possible
Dec 17, 2018
cfc5ca1
try using Cucumber Runner class instead of the runFeature call
Dec 18, 2018
7599b44
re-creating Katalon project in separate directory
Dec 19, 2018
9a2a30c
fixed path issue
Dec 19, 2018
1ddd7c2
fixed typo in shell file
Dec 19, 2018
2851dbd
try installing Katalon a directory up
Dec 19, 2018
ffd45d9
add additional cucumber test suite
Dec 20, 2018
2411fb5
revise cucumber runner path
Dec 20, 2018
8a8513c
move Katalon install location up a dir
Dec 20, 2018
26e697f
classpath addition
Dec 20, 2018
4cc510c
added git attribute file
pripley123 Dec 20, 2018
da1669a
update to Travis
Dec 20, 2018
455b756
changed Katalon directory permissions
Dec 20, 2018
a79c7a5
printout the classpath
Dec 20, 2018
9f9d41e
try runfeaturefile
Dec 20, 2018
4dbfdb3
try out BDD example project in Travis
Dec 20, 2018
be9ab10
removed special chars
pripley123 Dec 20, 2018
e3f4115
fixed path for KatalonCucumberBDD
Dec 20, 2018
9b9f08c
fixed executionProfile
Dec 20, 2018
276b5a0
update to classpath
Dec 20, 2018
8468670
try an alternate approach to calling katalon
Dec 20, 2018
1cd3608
sudo stuff to make it happen
Dec 21, 2018
0629c23
cleaned up Katalon tests
Dec 21, 2018
980fda2
hard coded url to navigate to in order to troubleshoot issue
Dec 21, 2018
80bf0d6
add in starting up of frontend
Dec 21, 2018
f0cbe7d
fixed some yarn-y stuff in Travis and commented out more tricky tests
Dec 21, 2018
ffcc055
open / delay / close browser test only
Dec 21, 2018
7745111
full Travis script
Dec 21, 2018
7d9f322
fixed yaml syntax error
Dec 21, 2018
9491722
created test files for upload file testing
Dec 31, 2018
95cd0f7
built out test cases / refactored code
Jan 2, 2019
e5fc27d
fixed WIP bug
Jan 2, 2019
6a4bdbe
changed test file extension
Jan 2, 2019
169119d
refactored code; added multiple file upload test support
Jan 3, 2019
82dd090
try navigating to url that does not use a global var
Jan 3, 2019
ce7b973
switched the tests for Travis to use the default profile
Jan 3, 2019
38ed95a
fixed path of microservice template config file; upgraded KS to 5.10.1
Jan 3, 2019
4d8e681
intitial Katalon automated testing commit
Dec 11, 2018
f759c79
travis for katalon integration tests
Dec 11, 2018
02d3e5a
travis tar tweak
Dec 11, 2018
308ce9b
run tests
Dec 11, 2018
8593af2
tweak to run tests it complained about bin/bash
Dec 11, 2018
aea6645
fixed line endings and project definition for automated tests
BrandonSharratt Dec 11, 2018
ce7838c
removed shebang as travis doesn't seem to have bin/bash
BrandonSharratt Dec 11, 2018
729907f
added more time for things to load in automated test
Dec 11, 2018
f145bad
travis tweaks
BrandonSharratt Dec 11, 2018
4e4fbf5
added Travis testing url via Profile
Dec 11, 2018
43aedaf
start ignoring local default profile
Dec 11, 2018
eb87c6e
added pip to integration test travis
BrandonSharratt Dec 11, 2018
f776c3f
changed how katalon studios is run:
BrandonSharratt Dec 11, 2018
9e0e139
added bin and Lib folders to repo (which apparently we need)
Dec 11, 2018
510f89a
added some classes we need to run Katalon studio scripts successfully
Dec 12, 2018
43940a1
same comment as previous commit
Dec 12, 2018
b110ab1
Commented out the the GlobalVariable class reference
Dec 12, 2018
a48dfb2
changed the path from backslashes to forward slashes
Dec 12, 2018
0048364
updated the version of Katalon Studio to install to 5.9.0
Dec 13, 2018
d227208
fixed path issue with installing Katalon
Dec 13, 2018
bda3139
printout the classpath file
Dec 13, 2018
2c79b80
Add a test suite to debug the Katalon integration
Dec 14, 2018
c671d44
update the travis file to call the new test testsuite
Dec 14, 2018
1e7d305
added execution permission to the testing sh file
Dec 14, 2018
3cfaa5a
fixed path for chmod-ing the testing sh file
Dec 14, 2018
2f8325c
added display setting to deal with X11 error when running test suite
Dec 14, 2018
1acfac6
travis tweaks
BrandonSharratt Dec 14, 2018
efb8fba
running katalon with sudo because chrome needs to bind a port apparently
BrandonSharratt Dec 14, 2018
e9a75a2
attempting to fix sudo environment vars
BrandonSharratt Dec 14, 2018
f8fa835
Added build stages
BrandonSharratt Dec 14, 2018
38d2370
changed how xvfb is run and installed chrome
BrandonSharratt Dec 14, 2018
0196cc4
tweaked how xvfb is used
BrandonSharratt Dec 14, 2018
eafc3f0
testing testsuite seemed to work so switching back to cucumber test
Dec 15, 2018
518a713
remove change directory command to
Dec 17, 2018
0cc9d4f
adding to the classpath to resolve missing class errors
Dec 17, 2018
1feef57
katalon needs openjdk 8 so install it
BrandonSharratt Dec 17, 2018
895fc7b
try an expanded non-cucumber test
Dec 17, 2018
6e8ab41
fix testing url bug; leaner travis build for testing integration
Dec 17, 2018
1a71143
a minimal cucumber test
Dec 17, 2018
201c688
explicitly provide the failure handling approach
Dec 17, 2018
69180ec
simpliest cucumber test possible
Dec 17, 2018
b84ba73
try using Cucumber Runner class instead of the runFeature call
Dec 18, 2018
c36d83b
re-creating Katalon project in separate directory
Dec 19, 2018
2fa10c6
fixed path issue
Dec 19, 2018
a4d0466
fixed typo in shell file
Dec 19, 2018
f77a544
try installing Katalon a directory up
Dec 19, 2018
89f5d75
add additional cucumber test suite
Dec 20, 2018
9b1850b
revise cucumber runner path
Dec 20, 2018
8bf65dd
move Katalon install location up a dir
Dec 20, 2018
1813b80
classpath addition
Dec 20, 2018
49ad12a
added git attribute file
pripley123 Dec 20, 2018
f2cca58
update to Travis
Dec 20, 2018
68db890
changed Katalon directory permissions
Dec 20, 2018
2f41fd7
printout the classpath
Dec 20, 2018
078a0a1
try runfeaturefile
Dec 20, 2018
f95002d
try out BDD example project in Travis
Dec 20, 2018
f318ece
fixed path for KatalonCucumberBDD
Dec 20, 2018
1c39fc6
fixed executionProfile
Dec 20, 2018
0213fbe
update to classpath
Dec 20, 2018
0624373
try an alternate approach to calling katalon
Dec 20, 2018
597dfe6
sudo stuff to make it happen
Dec 21, 2018
379b3a0
cleaned up Katalon tests
Dec 21, 2018
876a8d4
hard coded url to navigate to in order to troubleshoot issue
Dec 21, 2018
bc92d78
add in starting up of frontend
Dec 21, 2018
ee33741
fixed some yarn-y stuff in Travis and commented out more tricky tests
Dec 21, 2018
10d02d2
open / delay / close browser test only
Dec 21, 2018
e9d1206
full Travis script
Dec 21, 2018
895ad14
fixed yaml syntax error
Dec 21, 2018
8850f30
created test files for upload file testing
Dec 31, 2018
e47f0f0
built out test cases / refactored code
Jan 2, 2019
7cfc1ac
fixed WIP bug
Jan 2, 2019
367f1b8
changed test file extension
Jan 2, 2019
8f06281
refactored code; added multiple file upload test support
Jan 3, 2019
c670c26
try navigating to url that does not use a global var
Jan 3, 2019
390a56f
switched the tests for Travis to use the default profile
Jan 3, 2019
cb3057e
fixed path of microservice template config file; upgraded KS to 5.10.1
Jan 3, 2019
cd3e1d0
Merge branch 'feature/testing' of https://github.com/bcgov/OCWA into …
Jan 3, 2019
b068bc3
Use terraform environment for integration tests
Jan 3, 2019
b94b9e7
Put username and password in globals
Jan 3, 2019
e83eb55
Added researcher_1
Jan 3, 2019
d333aa4
Put username and password in globals
Jan 3, 2019
37cdc77
Fix errors
Jan 3, 2019
e9449ae
Fix errors
Jan 3, 2019
257c2ab
Fix errors with unknown host
Jan 3, 2019
5d5bbf9
typo GlobalVariables
Jan 4, 2019
c988d01
Correct password for researcher_1 user
Jan 4, 2019
3b15f8d
Updated travis to use Travis katalon profile
Jan 4, 2019
c52740b
Add ignore ssl for chrome headless in katalon
Jan 4, 2019
42b631b
Merge branch 'feature/testing' of https://github.com/bcgov/OCWA into …
Jan 4, 2019
b9efbe2
testing for uploading of supporting files
Jan 4, 2019
9eabada
merged changes - adding supporting file upload test
Jan 4, 2019
46af98c
Fixed terraform error in travis pipeline
Jan 4, 2019
42dc8ee
changed blocked ext file to be a zip; fixed request nav issue
Jan 4, 2019
875f32e
fixed extension of blocked extension text file
Jan 4, 2019
ae6b233
Merge branch 'feature/testing' of https://github.com/bcgov/OCWA.git i…
Jan 4, 2019
a090ad9
updated travis to use the default profile
Jan 4, 2019
eaf53fa
Reverted travis to use Travis profile
Jan 4, 2019
f834495
added a delay for loading main page before searching for request
Jan 4, 2019
b5c2e61
add a delay when the main page loads before trying to click link
Jan 4, 2019
8b87d61
added steps for team sharing testing; added sample supporting files
Jan 8, 2019
e5928fe
added wait for btn to be clickable for "save and close" btn
Jan 8, 2019
6fc91a0
added prints to console to assist with troubleshooting; added test files
Jan 8, 2019
129e85f
added more prints to console to better describe what tests are doing
Jan 9, 2019
1cf3feb
split out the blocked/warning file upload tests into separate features
Jan 10, 2019
b5d4203
refined test case features; created "import into SRE" test case features
Jan 10, 2019
02c32b3
add more time before clicking the save and close button
Jan 11, 2019
4c88158
added better wait checks for disabled buttons
Jan 12, 2019
6056eb1
removed hard delays in favour of more "wait" functions
Jan 18, 2019
9baa9f1
merge conflict
pripley123 Jan 18, 2019
48cfcdd
added a delay between upload and save close btn click
Jan 18, 2019
f0785cd
tweaks to test script; switched test to test submitting a request
Jan 21, 2019
ecd9bb8
Merge branch 'develop' of https://github.com/bcgov/OCWA into feature/…
pripley123 Jan 21, 2019
c2b4a66
switched back to draft tests; added search to tests
Jan 21, 2019
ad3d86c
merge in update app for testing
pripley123 Jan 21, 2019
ae3e3fc
add 1 sec delay for all actions
Jan 22, 2019
880243d
testing if Travis issue is related to inline ajax call
Jan 23, 2019
e8e36ef
removed test lines that created an issue when no files are uploaded
Jan 24, 2019
dcb5fba
add api request test to travis script; minor fix for re-submit test
Jan 25, 2019
5e2ee93
Updates to support new code changes
Jan 26, 2019
b8682bc
tweak test for ocwa spin up
BrandonSharratt Jan 28, 2019
d79646f
tweaks and faster testing
BrandonSharratt Jan 28, 2019
32014f5
db tweaks
BrandonSharratt Jan 28, 2019
b980063
Merge branch 'feature/testing' of https://github.com/bcgov/OCWA into …
BrandonSharratt Jan 28, 2019
2abc398
tweaks to the db provisioning
BrandonSharratt Jan 28, 2019
3ab2e83
tweaks to the db provisioning
BrandonSharratt Jan 28, 2019
7c82676
tweaks to the db provisioning
BrandonSharratt Jan 28, 2019
a869b01
Fix scrolling issues, load Unauthorized if there are no groups presen…
Jonesy Jan 28, 2019
97655bf
tweaks to the db provisioning
BrandonSharratt Jan 28, 2019
ea414a9
tweaks to the db provisioning
BrandonSharratt Jan 28, 2019
ebe1476
db tweaks, more int test debugging
BrandonSharratt Jan 28, 2019
9d7b1bb
tweak travis hosts for ocwa terra
BrandonSharratt Jan 28, 2019
7b44b95
using host in ocwa_frontend
BrandonSharratt Jan 28, 2019
7ec7dbe
fixed depends on
BrandonSharratt Jan 28, 2019
9f66ef0
squeezed the scans out in to the respective build area for efficiency
BrandonSharratt Jan 28, 2019
03b7618
formatting
BrandonSharratt Jan 28, 2019
1def8ae
Fix filter error with approved request on exporter side, hide some ac…
Jonesy Jan 28, 2019
84da521
fixed sonar ordering
BrandonSharratt Jan 29, 2019
4a8f15a
put frontend build after tests
BrandonSharratt Jan 29, 2019
e3d0862
put tests before components as they build images
BrandonSharratt Jan 29, 2019
846a9c8
Update networking to have a fixed ip for nginx to fix frontend issue …
Jan 29, 2019
ab93855
Update networking to have a fixed ip for nginx to fix frontend issue …
Jan 29, 2019
c04ba6b
keep locally to have a cleaner terraform destroy
Jan 29, 2019
38942b9
Upgrade keyclose to version 4.8.3.Final
Jan 29, 2019
8703297
Network changes to have a clean deployment
Jan 29, 2019
791ef99
remove commented config
Jan 29, 2019
95eb685
docker logs again
BrandonSharratt Jan 29, 2019
d673658
Merge branch 'feature/testing' of https://github.com/bcgov/OCWA into …
BrandonSharratt Jan 29, 2019
bf27f3b
removed docker logs
BrandonSharratt Jan 29, 2019
636ac50
integration testing builds it's own images
BrandonSharratt Jan 30, 2019
5207cdd
tweaked integration stage to use tst images
BrandonSharratt Jan 30, 2019
d590c69
missing tst config
BrandonSharratt Jan 30, 2019
179624a
reverted to having int after unit
BrandonSharratt Jan 30, 2019
1fbd244
Merge branch 'feature/testing' of https://github.com/bcgov/OCWA into …
BrandonSharratt Jan 30, 2019
ce7edf2
Merge branch 'develop' of https://github.com/bcgov/OCWA into develop
BrandonSharratt Jan 30, 2019
4cf1084
version endpoint
BrandonSharratt Jan 31, 2019
56898b1
tweaked env modification
BrandonSharratt Jan 31, 2019
8cc10f3
Add cross-env for Windows and Unix compatibility
jujaga Jan 31, 2019
8c6fc28
fixed validate Api trying to get policy Api version
BrandonSharratt Jan 31, 2019
140d407
Merge branch 'fix/windows-cross-env' into develop
jujaga Jan 31, 2019
f4120da
Add LF converted files for test.
Jonesy Jan 31, 2019
97d9549
Add ui_tests/bin to .gitignore
jujaga Jan 31, 2019
f919903
Merge branch 'feature/crlf-lf' into develop
jujaga Jan 31, 2019
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
14 changes: 14 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto eol=lf

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.h text

# Declare files that will always have CRLF line endings on checkout.
*.sln text eol=lf

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ dist/
downloads/
eggs/
.eggs/
lib/
#lib/
lib64/
parts/
sdist/
Expand Down Expand Up @@ -206,3 +206,6 @@ venv.bak/

# mypy
.mypy_cache/

#Katalon
config/.metadata
Loading