Skip to content
This repository was archived by the owner on May 7, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
449c4c2
[WIP] cypress pack initial commit
khalidelaggan Jan 31, 2020
e8f092a
Added the first 101 test for RCMP QC training
khalidelaggan Jan 31, 2020
ca7501f
remove unwanted tests
khalidelaggan Jan 31, 2020
8ec2817
working FormArrayControl component and Adapters for radio and checkboxes
amazingphilippe Feb 6, 2020
43b350c
broken, but added a Field component to ease markup
amazingphilippe Feb 10, 2020
224e8dd
Merge branch 'master' of github.com:cds-snc/report-a-cybercrime into …
amazingphilippe Feb 10, 2020
0554387
rebuilt the howdiditstart page using checkbox component.
amazingphilippe Feb 10, 2020
984bb3f
lint and passing tests. Not all new components have tests
amazingphilippe Feb 11, 2020
aa7c496
added a test for FormArrayControl
amazingphilippe Feb 11, 2020
082a5fc
merged with master
amazingphilippe Feb 11, 2020
cffe09b
Merge remote-tracking branch 'origin/master' into cypress
khalidelaggan Feb 12, 2020
66fe8e5
Merge remote-tracking branch 'origin/checkbox-component' into cypress
khalidelaggan Feb 12, 2020
4ca1052
Resolved Merge Conflict with deleted dev dependencies
khalidelaggan Feb 12, 2020
84c20a6
[RCMP QC] 101 demo and training tests
khalidelaggan Feb 13, 2020
31eb6c2
[RCMP QC Training] How to read fixture data
khalidelaggan Feb 13, 2020
568b310
Merge Master into Cypress
khalidelaggan Feb 19, 2020
cf6e693
Merge remote-tracking branch 'origin/master' into cypress
khalidelaggan Feb 19, 2020
131cd6f
Added a simple step definition file + cleanups
khalidelaggan Feb 19, 2020
9e5c7eb
Generate e2e test report for RCMP QC team demo
khalidelaggan Feb 19, 2020
4a1cd54
Enabled only HTML output format
khalidelaggan Feb 19, 2020
3d216db
Added Staging url placeholder
khalidelaggan Feb 19, 2020
44d9865
Added axe checks to the HP
khalidelaggan Feb 19, 2020
8a50dae
Added visual test folders
khalidelaggan Feb 19, 2020
1f51a91
Added the correct verb
khalidelaggan Feb 19, 2020
71b08d8
updated with direct path as this won't work on windows
khalidelaggan Feb 19, 2020
b57dff6
Merge remote-tracking branch 'origin/master' into cypress
khalidelaggan Feb 20, 2020
1a908c0
[Testing] Adding tests - configs
khalidelaggan Feb 20, 2020
d078ab1
Adding the missing scripts
khalidelaggan Feb 20, 2020
88de650
Added to the correct workflow
khalidelaggan Feb 20, 2020
3ef3183
Syntax error - try again
khalidelaggan Feb 20, 2020
edaddd4
Syntax error -
khalidelaggan Feb 20, 2020
d07ec08
Another check failed
khalidelaggan Feb 20, 2020
39c7bd0
another fail testing
khalidelaggan Feb 20, 2020
416037e
Added to ignore
khalidelaggan Feb 20, 2020
83af38c
Added start-server-and-test
khalidelaggan Feb 20, 2020
100c184
More tweaks
khalidelaggan Feb 20, 2020
1a40de5
Testing the CLI
khalidelaggan Feb 20, 2020
8904892
Another test to debug things
khalidelaggan Feb 20, 2020
d29e7b1
Merge remote-tracking branch 'origin/master' into cypress
khalidelaggan Feb 24, 2020
f09098c
Merge branch 'master' into cypress
khalidelaggan Feb 24, 2020
fa8c1a8
Merge branch 'master' into cypress
khalidelaggan Feb 24, 2020
50383e2
Merge branch 'master' into cypress
khalidelaggan Feb 24, 2020
ad05873
Merge remote-tracking branch 'origin/master' into cypress
khalidelaggan Feb 24, 2020
2acd600
Updated
khalidelaggan Feb 24, 2020
3260fef
Update the lock file
khalidelaggan Feb 24, 2020
1d654a0
Merge branch 'master' into cypress
khalidelaggan Feb 24, 2020
2618da4
Merge branch 'master' into cypress
khalidelaggan Feb 24, 2020
c3c5dbe
Updated with recent cypress dependencies
khalidelaggan Feb 24, 2020
3c381e9
Cypress dependencies
khalidelaggan Feb 24, 2020
962880d
Testing the action log
khalidelaggan Feb 24, 2020
7530d80
Merge branch 'master' into cypress
khalidelaggan Feb 24, 2020
4dd6a2a
Github actions to run local instance
khalidelaggan Feb 24, 2020
7dba04e
Debugging - Initiate a test without the reference
khalidelaggan Feb 25, 2020
ebd5eef
Merge branch 'master' into cypress
khalidelaggan Feb 25, 2020
1731cb7
Debugging - added back the step definition config
khalidelaggan Feb 25, 2020
80d9afc
Merge branch 'cypress' of github.com:cds-snc/report-a-cybercrime into…
khalidelaggan Feb 25, 2020
f7f40e6
Debugging - another failed attempt - not reading the cucumber prepro…
khalidelaggan Feb 25, 2020
ad74b76
Added QC specs + more defensive coding
khalidelaggan Feb 27, 2020
e1e1bec
Testing smart tagging in CI
khalidelaggan Feb 27, 2020
4094414
simplifying the test further
khalidelaggan Feb 27, 2020
130d596
Testing the new upgrade + Firefox support added
khalidelaggan Feb 27, 2020
3bbf26f
Removed testing reports for now
khalidelaggan Feb 27, 2020
7de2f3b
Testing smoke tag with QC
khalidelaggan Feb 28, 2020
bb6588d
Merge remote-tracking branch 'origin/master' into cypress
khalidelaggan Feb 28, 2020
e3a45bd
Merge branch 'master' into cypress
khalidelaggan Feb 28, 2020
c11af06
Trigger another test
khalidelaggan Feb 28, 2020
686f60b
Merge branch 'cypress' of github.com:cds-snc/report-a-cybercrime into…
khalidelaggan Feb 28, 2020
b4d1103
Merge branch 'master' into cypress
khalidelaggan Feb 28, 2020
dbe78de
Merge remote-tracking branch 'origin/master' into cypress
khalidelaggan Mar 9, 2020
5c3c0b0
Added a11y tracker + misc
khalidelaggan Mar 12, 2020
7fa607b
Added a11y
khalidelaggan Mar 17, 2020
7faa56d
Merge branch 'cypress' of github.com:cds-snc/report-a-cybercrime into…
khalidelaggan Mar 17, 2020
ba80208
Merge remote-tracking branch 'origin/master' into cypress
khalidelaggan Mar 17, 2020
d19fc73
cleanup
khalidelaggan Mar 17, 2020
01e8c83
Cleanup + add new tests
khalidelaggan Mar 18, 2020
94900c6
Update the package-lock
khalidelaggan Mar 18, 2020
f7367e8
Fixed merge conflict
khalidelaggan Mar 18, 2020
587c135
Prepare for minimal testing
khalidelaggan Mar 18, 2020
5d510ec
Merge remote-tracking branch 'origin/master' into cypress
khalidelaggan Mar 18, 2020
f60c208
Updated a fresh copy
khalidelaggan Mar 18, 2020
b1dc4e9
Running a minimal test in CI
khalidelaggan Mar 18, 2020
d85dd3c
No needed for this release
khalidelaggan Mar 18, 2020
3e15927
file sync
khalidelaggan Mar 18, 2020
f099db4
Adding more config to properly run a11y
khalidelaggan Mar 18, 2020
3af3c44
Testing configs for a11y
khalidelaggan Mar 18, 2020
fec5bce
typo
khalidelaggan Mar 18, 2020
d60d080
Merge branch 'master' into cypress
khalidelaggan Mar 18, 2020
98f3e83
Remove the fake passport images
khalidelaggan Mar 19, 2020
3ea3b1f
Merge branch 'cypress' of github.com:cds-snc/report-a-cybercrime into…
khalidelaggan Mar 19, 2020
6dcbb53
Merge branch 'master' into cypress
khalidelaggan Mar 19, 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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into cypress
  • Loading branch information
khalidelaggan committed Feb 24, 2020
commit d29e7b18ba5c48849c1ec9eb631ff8acb4558e3f
111 changes: 6 additions & 105 deletions f2/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions f2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
"scripts": {
"prod": "npm run build && node server.js",
"build": "react-scripts build",
"start": "NODE_ENV=test node server.js",
"test": "react-scripts test --watchAll=false",
"coverage": "react-scripts test --coverage --watchAll=false",
"start": "NODE_ENV=production node server.js",
"test": "SELF_HARM_WORDS= react-scripts test --watchAll=false",
"coverage": "SELF_HARM_WORDS= react-scripts test --coverage --watchAll=false",
"watch": "react-scripts test",
"dbg": "react-scripts --inspect-brk test --watchAll=false --runInBand",
"eject": "react-scripts eject",
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.