From a42e8ae2ad70c6fbb02d217bfbceafeeddcddb2e Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Sat, 18 Dec 2021 00:49:46 +0000 Subject: [PATCH] --- e2e/package.json | 5 ++++- e2e/support/index.js | 52 ++++++++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/e2e/package.json b/e2e/package.json index bbabdd6..fd5e629 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -12,7 +12,10 @@ "devDependencies": {}, "scripts": { "open": "./node_modules/.bin/cypress open", - "smoke-ff": "./node_modules/.bin/cypress run --browser firefox --spec ./tests/regression/smoke/*.js" + "all-chrome": "./node_modules/.bin/cypress run --browser chrome", + "all-ff": "./node_modules/.bin/cypress run --browser firefox", + "smoke-ff": "./node_modules/.bin/cypress run --browser firefox --spec ./tests/regression/1-smoke/*.js", + "smoke-chrome": "./node_modules/.bin/cypress run --browser chrome --spec ./tests/regression/1-smoke/*.js" }, "author": "", "license": "ISC" 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); + }); + }); +});