Simplified intigration test for K8s in cypress #1201

Shubham-Patel07 · 2024-01-25T14:46:59Z

What kind of changes does this PR include?

Fixes or refactors
A new challenge
Additional documentation
Something else

Description

Analyzed the tests written in java and rewritten in simplified cypress script for the challanges 5,6,7 and 33
Closes #1114

Checklist:

All the contributions made are solely the work of me and my co-authors
I tested the changes in this PR (if applicable)
I added unit tests to ensure my change works (when change in Java or on front-end code)
I added UI tests to ensure my UI changes work (when change in the overall UI, not needed if just adding a challenge)
The PR passes pre-commit hooks and automated tests

…tring is not empty, in ChallangeController and ChallengeUI

…nimations

…box and now all test working properly and examining appropriately

…endpoint

commjoen

Hi @Shubham-Patel07 ,
Thank you for your PR! Can you please have a look and fix the following 2 items please?

Right now the tests will be triggered always, while I would like to only have these specifically as part of the k8s GitHub workflow test. This means that these should be setup as separate tests outside of the existing e2e folder with their own config and triggered in the workflow. Can you separate them out and provide a separate config and trigger it from the GitHub workflow please?
Next, they don’t check that the default values are not in use (eg we will not know if they challenges actually work or not). Can you update the tests please?

Feel free to get in touch on Slack to discuss the details.

Shubham-Patel07 · 2024-01-26T19:19:11Z

Sure I'll do the changes

.github/workflows/K8s-challange-test.yml

…lues on spoil

commjoen · 2024-02-01T23:05:26Z

.github/workflows/minikube-k8s-test.yml

+          source ~/.bashrc
+          npm install
+          sudo java --version
+          ./mvn spring-boot:run


see the unchanged code above: we already have everything running on minikube. CAn you launch the cypress tests against what is launched above please?
That means there is no need to install java and such again: just npx should do

I'm sorry I didn't had a look on it, I'll work on it

commjoen · 2024-02-01T23:06:20Z

src/test/K8s-tests/cypress/support/commands.js

@@ -0,0 +1,25 @@
+// ***********************************************


do we really need this file or can we throw it away?

commjoen · 2024-02-01T23:08:16Z

src/main/resources/static/css/style.css

@@ -70,3 +70,69 @@ tr.solved {
 .table {
    --bs-table-bg: rgba(0, 0, 0, 0) !important;
 }
+
+/*toggle switch styling*/


we are now combining 2 different things in a pr, your previous pr with the ui change and the the cypress tests, can we please separate them?

I'm really sorry actually it was not intentional, I accidentally pushed that

Can you remove all of it from this pr or create a fresh one please?

commjoen · 2024-02-04T21:50:09Z

src/test/e2e/cypress/integration/themeSwitch.cy.js

-      cy.dataCy(ThemeSwitchPage.DARK_MODE_RADIO).click()
-      cy.get(ThemeSwitchPage.DARK_MODE).should('exist')
+    cy.visit('/')
+    cy.dataCy(ThemeSwitchPage.DARK_MODE_CHECKBOX).then(($checkbox) => {


Can you please remove all theme related items in the PR please?

Shubham-Patel07 and others added 17 commits December 18, 2023 21:41

Fix: Used get(0) function insted of getFirst() to check weather the s…

0c71d1c

…tring is not empty, in ChallangeController and ChallengeUI

Merge branch 'OWASP:master' into master

1137049

Add: changed the logic of button from racdio button to checkbox

71c285c

Merge branch 'OWASP:master' into master

cc6ae17

Add: changed some styles to make the checkbox invisible and add the a…

4a38a1c

…nimations

Fix: Removed unwanted classes

23ad4a1

Fix: Changed the test cypress script logic from radio button to check…

9134c2a

…box and now all test working properly and examining appropriately

Fix: cypress scripts for challange-5

00a29a5

Fix: cypress scripts for challange-6

5e18ecf

Fix: cypress scripts for challange-7

089af8b

Fix: cypress scripts for challange-33

992da9c

Fix: automated checking for correct answer using /spoil/{short-name} …

25bbd54

…endpoint

Fix: cypress scripts for challange-5

16d4b41

Fix: cypress scripts for challange-6

81ffec5

Fix: cypress scripts for challange-7

7771b31

Fix: cypress scripts for challange-33

3ccddeb

Fix: automated checking for correct answer using /spoil/{short-name} …

59d8658

…endpoint

Shubham-Patel07 requested review from commjoen and bendehaan as code owners January 25, 2024 14:46

[pre-commit.ci lite] apply automatic fixes

9a0cc60

commjoen requested changes Jan 26, 2024

View reviewed changes

commjoen and others added 2 commits January 28, 2024 10:29

Merge branch 'master' into fix/Issue1114

e8284eb

Create K8s-challange-test.yml

34aede5

commjoen reviewed Jan 29, 2024

View reviewed changes

.github/workflows/K8s-challange-test.yml Outdated Show resolved Hide resolved

commjoen and others added 5 commits January 29, 2024 08:40

Merge branch 'master' into fix/Issue1114

42d3d7a

Add: workflow added, changed the tests now fails on having default va…

6766664

…lues on spoil

Add: workflow added, changed the tests now fails on having default va…

43b4f62

…lues on spoil

Merge branch 'master' into fix/issue1114

0ba05d9

Add: workflow added, changed the tests now fails on having default va…

9cf3be8

…lues on spoil

Shubham-Patel07 and others added 10 commits January 31, 2024 08:53

Update minikube-k8s-test.yml node version to 21

b2a98e2

Merge branch 'master' into fix/Issue1114

b727aa0

Merge branch 'master' into fix/Issue1114

ac47c53

Add: workflow update

4a2fd2e

Add: workflow update

298b373

Add: workflow update

466317a

Add: workflow update

dc4a56e

Add: workflow update

5147b3f

Add: workflow update

ea9d752

Add: workflow update

3c6e8ff

commjoen reviewed Feb 1, 2024

View reviewed changes

pre-commit-ci-lite bot and others added 4 commits February 1, 2024 23:08

[pre-commit.ci lite] apply automatic fixes

22ad085

Add: workflow update

7acdba6

Merge remote-tracking branch 'origin/fix/Issue1114' into fix/Issue1114

0654058

Add: workflow update

fb44ddc

Shubham-Patel07 marked this pull request as draft February 3, 2024 07:11

Shubham-Patel07 added 8 commits February 3, 2024 22:44

Add: workflow update

95c9d83

Add: workflow update

6a2cd03

Add: workflow update

db9ce85

Add: workflow update

924c821

Add: workflow update final

22fc825

Add: workflow update final

eb3cca7

Add: workflow update final and config file updated

bfac516

Add: reverted unwanted changes

7405b99

Shubham-Patel07 marked this pull request as ready for review February 4, 2024 19:06

commjoen reviewed Feb 4, 2024

View reviewed changes

[pre-commit.ci lite] apply automatic fixes

35b9a7e

Shubham-Patel07 closed this by deleting the head repository Feb 5, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Simplified intigration test for K8s in cypress #1201

Simplified intigration test for K8s in cypress #1201

Shubham-Patel07 commented Jan 25, 2024 •

edited by commjoen

Loading

commjoen left a comment •

edited

Loading

Shubham-Patel07 commented Jan 26, 2024

commjoen Feb 1, 2024 •

edited

Loading

Shubham-Patel07 Feb 2, 2024

commjoen Feb 1, 2024 •

edited

Loading

commjoen Feb 1, 2024

Shubham-Patel07 Feb 2, 2024

commjoen Feb 3, 2024 •

edited

Loading

commjoen Feb 4, 2024

		@@ -0,0 +1,25 @@
		// ***********************************************

Simplified intigration test for K8s in cypress #1201

Simplified intigration test for K8s in cypress #1201

Conversation

Shubham-Patel07 commented Jan 25, 2024 • edited by commjoen Loading

What kind of changes does this PR include?

Description

Checklist:

commjoen left a comment • edited Loading

Choose a reason for hiding this comment

Shubham-Patel07 commented Jan 26, 2024

commjoen Feb 1, 2024 • edited Loading

Choose a reason for hiding this comment

Shubham-Patel07 Feb 2, 2024

Choose a reason for hiding this comment

commjoen Feb 1, 2024 • edited Loading

Choose a reason for hiding this comment

commjoen Feb 1, 2024

Choose a reason for hiding this comment

Shubham-Patel07 Feb 2, 2024

Choose a reason for hiding this comment

commjoen Feb 3, 2024 • edited Loading

Choose a reason for hiding this comment

commjoen Feb 4, 2024

Choose a reason for hiding this comment

Shubham-Patel07 commented Jan 25, 2024 •

edited by commjoen

Loading

commjoen left a comment •

edited

Loading

commjoen Feb 1, 2024 •

edited

Loading

commjoen Feb 1, 2024 •

edited

Loading

commjoen Feb 3, 2024 •

edited

Loading