diff --git a/e2e/cypress.json b/e2e/cypress.json index 85cc522..cdf1173 100644 --- a/e2e/cypress.json +++ b/e2e/cypress.json @@ -2,13 +2,13 @@ "defaultCommandTimeout":10000, "integrationFolder": "tests", "supportFile":"support", - "xbaseUrl": "http://localhost:7575", - "DEVOPS_baseUrl": "https://test.helloayanova.com", - "baseUrl":"http://localhost:8080", + "baseUrl": "http://localhost:7575", + "xxxbaseUrl": "https://test.helloayanova.com", + "xxbaseUrl":"http://localhost:8080", "video":false, "env": { "apiBaseUrl":"http://localhost:7575/api/v8.0/", - "DEVOPS_apiBaseUrl":"https://test.helloayanova.com/api/v8.0/", + "xxapiBaseUrl":"https://test.helloayanova.com/api/v8.0/", "adminusername": "superuser", "adminpassword": "l3tm3in", "accountinguser": "Accounting", diff --git a/e2e/support/index.js b/e2e/support/index.js index fb0917b..d0a2dff 100644 --- a/e2e/support/index.js +++ b/e2e/support/index.js @@ -63,29 +63,29 @@ function confirmJobDone(jobId, authToken) { } -// before(() => { -// cy.request({ -// url: `${Cypress.env("apiBaseUrl")}auth`, -// method: "POST", -// body: { -// login: Cypress.env("adminusername"), -// password: Cypress.env("adminpassword") -// } -// }) -// .its("body") -// .then((res) => { -// cy.request({ -// method: "POST", -// url: `${Cypress.env("apiBaseUrl")}trial/seed/small/-7/true`, -// auth: { -// bearer: res.data.token -// } -// }) -// .its("body") -// .then((resjob) => { -// cy.log(`resjob is: ${resjob}`); -// // expect(resjob.body).to.have.property('jobId'); -// confirmJobDone(resjob.jobId, res.data.token); -// }); -// }); -// }); +before(() => { + cy.request({ + url: `${Cypress.env("apiBaseUrl")}auth`, + method: "POST", + body: { + login: Cypress.env("adminusername"), + password: Cypress.env("adminpassword") + } + }) + .its("body") + .then((res) => { + cy.request({ + method: "POST", + url: `${Cypress.env("apiBaseUrl")}trial/seed/small/-7/true`, + auth: { + bearer: res.data.token + } + }) + .its("body") + .then((resjob) => { + cy.log(`resjob is: ${resjob}`); + // expect(resjob.body).to.have.property('jobId'); + confirmJobDone(resjob.jobId, res.data.token); + }); + }); +});