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

Jump to bottom

feat(backend): Change backend URL for e2e #1287

Merged
merged 5 commits into from
Dec 2, 2022
Merged

feat(backend): Change backend URL for e2e #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8af8c6d
feat(backend): Change backend URL for e2e
dtrouillet Nov 28, 2022
b6d15f1
feat(backend): Change backend URL for e2e
dtrouillet Nov 28, 2022
6a207b0
fix(cypress): clear input with invoke('val', '') instead of clear()
dtrouillet Dec 1, 2022
a3f322b
fix(cypress): clear input with then instead of clear()
dtrouillet Dec 2, 2022
c99f54c
fix(cypress): clear input with then instead of clear()
dtrouillet Dec 2, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
uses: cypress-io/github-action@v4
with:
start: npm run start:coverage
wait-on: 'http://localhost:4200, http://ebad.herokuapp.com/ebad/actuator/health'
wait-on: 'http://localhost:4200, https://ebad-demo.homefaya.fr/ebad/actuator/health'
wait-on-timeout: 180
browser: chrome
command-prefix: npx
Expand Down
5 changes: 4 additions & 1 deletion cypress/support/identity-admin.commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ Cypress.Commands.add("updateIdentityAdmin", ({nameToUpdate, name, login, passwor


if (name) {
cy.get('#name').clear().type(name);
cy.get('#name').clear().clear()
.then(() => cy.get('#name').should('be.empty'))
.then(() => cy.get('#name').type(name))
.then(() => cy.get('#name').should('have.value', name))
}
if (login) {
cy.get('#login').clear().type(login);
Expand Down
5 changes: 4 additions & 1 deletion cypress/support/identity-environment.commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,10 @@ Cypress.Commands.add("updateIdentityManage", ({applicationName, nameToUpdate, na


if (name) {
cy.get('#name').clear().type(name);
cy.get('#name').clear()
.then(() => cy.get('#name').should('be.empty'))
.then(() => cy.get('#name').type(name))
.then(() => cy.get('#name').should('have.value', name))
}
if (login) {
cy.get('#login').clear().type(login);
Expand Down
5 changes: 3 additions & 2 deletions proxy-cov.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"/ebad":
{
"target": "https://ebad.herokuapp.com/ebad",
"secure": false
"target": "https://ebad-demo.homefaya.fr",
"secure": false,
"changeOrigin": true
}
}
5 changes: 3 additions & 2 deletions proxy.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"/ebad":
{
"target": "http://localhost:11006",
"secure": false
"target": "https://ebad-demo.homefaya.fr",
"secure": false,
"changeOrigin": true
}
}
4 changes: 2 additions & 2 deletions src/assets/local-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"production": true,
"jwt": true,
"apiUrl": "https://ebad.herokuapp.com/ebad",
"wsUrl": "wss://ebad.herokuapp.com/ebad/ws"
"apiUrl": "/ebad",
"wsUrl": "wss://ebad-demo.homefaya.fr/ebad/ws"
}