Skip to content

Conversation

sidshas03
Copy link

@sidshas03 sidshas03 commented Sep 12, 2025

This PR resolves merge conflicts and npm test errors that arose after rebasing #1165 (pr-1165) onto the latest main.
It also fixes a timeout issue in the E2E test suite, ensuring the new Docker Compose–based setup runs successfully without hanging.

Key changes:
Resolved package-lock.json and source conflicts from rebase
Installed missing test dependencies to fix npm test errors
Adjusted Docker Compose configuration by removing the obsolete version field
Stabilized the E2E workflow so it waits correctly for the service healthcheck

coopernetes and others added 4 commits August 22, 2025 13:10
- Remove verbose logging from Dockerfile
- pin dependent actions in new e2e workflow to their respective commits
- refactor the tests to work slightly more robustly (handle creds, etc)
- Removed the obsolete 'version: 3.7' field from docker-compose.yml
- This fixes the warning about the version field being obsolete in newer Docker Compose versions
- The e2e tests now run without warnings
Copy link

netlify bot commented Sep 12, 2025

Deploy Preview for endearing-brigadeiros-63f9d0 ready!

Name Link
🔨 Latest commit 745ed94
🔍 Latest deploy log https://app.netlify.com/projects/endearing-brigadeiros-63f9d0/deploys/68c44d2f6c858c0008739c41
😎 Deploy Preview https://deploy-preview-1199--endearing-brigadeiros-63f9d0.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

Copy link

linux-foundation-easycla bot commented Sep 12, 2025

CLA Signed

The committers listed above are authorized under a signed CLA.

- Fix OIDC configuration syntax errors
- Update Cypress baseUrl to use correct port (8080)
- Fix CI workflow to use correct port and remove & from start command
- Ensure frontend is built before running tests
- CSRF protection already properly disabled in test environment

Cypress tests now pass:
- autoApproved.cy.js: 1/1 passing
- login.cy.js: 8/8 passing
- repo.cy.js: failing due to rate limiting (separate issue)

This resolves the main issues mentioned in the failing job:
- CSRF Token Missing Errors: Fixed by proper test environment config
- Shell Script Syntax Error: Fixed by removing & from start command
- Unknown Authentication Strategy: Fixed OIDC syntax errors
- Route Not Hit: Fixed by building frontend and using correct port
- Fix CSRF protection by setting NODE_ENV=test in CI
- Fix OIDC strategy by checking enabled flag before configuration
- Fix port configuration by using correct server port (8080)
- Add start:ci script to run server only (not dev client)
- Set CYPRESS_BASE_URL environment variable for consistency

This should resolve:
- CSRF token missing errors in CI
- Unknown authentication strategy errors
- Port mismatch issues (3000 vs 8080)
- Shell script syntax errors with & character
Resolved conflicts:
- .github/workflows/ci.yml: Kept improved Cypress configuration with start:ci script
- package.json: Merged start:ci script with updated build script
- package-lock.json: Used main branch version for dependency resolution
- .eslintrc.json: Fixed cypress/globals environment issue

This maintains all the e2e testing improvements while incorporating latest main branch changes.
@coopernetes
Copy link
Contributor

Hi, the work from PR #1165 must be properly attributed to our company (RBC). I would appreciate if you would refrain from cherry-picking those public commits onto your own branches. We have strict policy internally and it's not open to direct collaboration (moving the code into separate branches/PRs).

That said, thank you for these fixes and I really appreciate the work in this PR! I would like to integrate them back into the original PR instead of working through a duplicate one. I invite you to review the original PR if possible.

Closing in favour of #1165

@sidshas03
Copy link
Author

Thank you for the clarification @coopernetes sir. I understand and will avoid duplicating work from pull request #1165 going forward.

If there are any tasks or issues where assistance is needed, such as Cypress CI fixes or Docker Compose updates, please feel free to point me to them. I would be happy to contribute wherever it is helpful.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants