This commit is contained in:
2021-12-15 01:11:38 +00:00
parent 9793026265
commit a8c429d2de
2 changed files with 45 additions and 44 deletions

View File

@@ -21,7 +21,8 @@ Report printing works
"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNTAwIDI0OS42IiB3aWR0aD0iNTAwIiBoZWlnaHQ9IjI0OS42Ij48Y2lyY2xlIHI9IjEuNSIgY3g9IjAuMzk5OTkzODk2NDg0Mzc1IiBjeT0iMCIgZmlsbD0icmdiKDAsIDAsIDApIj48L2NpcmNsZT48Y2lyY2xlIHI9IjEuNSIgY3g9IjQ5OC4zOTk5OTM4OTY0ODQ0IiBjeT0iMCIgZmlsbD0icmdiKDAsIDAsIDApIj48L2NpcmNsZT48Y2lyY2xlIHI9IjEuNSIgY3g9IjI0OS4zOTk5OTM4OTY0ODQzOCIgY3k9IjEyNSIgZmlsbD0icmdiKDAsIDAsIDApIj48L2NpcmNsZT48Y2lyY2xlIHI9IjEuNSIgY3g9IjAuMzk5OTkzODk2NDg0Mzc1IiBjeT0iMjQ5IiBmaWxsPSJyZ2IoMCwgMCwgMCkiPjwvY2lyY2xlPjxjaXJjbGUgcj0iMS41IiBjeD0iNDk4LjM5OTk5Mzg5NjQ4NDQiIGN5PSIyNDkiIGZpbGw9InJnYigwLCAwLCAwKSI+PC9jaXJjbGU+PC9zdmc+"
"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNTAwIDI0OS42IiB3aWR0aD0iNTAwIiBoZWlnaHQ9IjI0OS42Ij48Y2lyY2xlIHI9IjEuNSIgY3g9IjAuMzk5OTkzODk2NDg0Mzc1IiBjeT0iMCIgZmlsbD0icmdiKDAsIDAsIDApIj48L2NpcmNsZT48Y2lyY2xlIHI9IjEuNSIgY3g9IjQ5OC4zOTk5OTM4OTY0ODQ0IiBjeT0iMCIgZmlsbD0icmdiKDAsIDAsIDApIj48L2NpcmNsZT48Y2lyY2xlIHI9IjEuNSIgY3g9IjI0OS4zOTk5OTM4OTY0ODQzOCIgY3k9IjEyNSIgZmlsbD0icmdiKDAsIDAsIDApIj48L2NpcmNsZT48Y2lyY2xlIHI9IjEuNSIgY3g9IjAuMzk5OTkzODk2NDg0Mzc1IiBjeT0iMjQ5IiBmaWxsPSJyZ2IoMCwgMCwgMCkiPjwvY2lyY2xlPjxjaXJjbGUgcj0iMS41IiBjeD0iNDk4LjM5OTk5Mzg5NjQ4NDQiIGN5PSIyNDkiIGZpbGw9InJnYigwLCAwLCAwKSI+PC9jaXJjbGU+PC9zdmc+"

View File

@@ -25,26 +25,26 @@ Cypress.config("cyid", `cy${new Date().getTime()}`);
//Generate fresh data
//
//
//via UI
// before(() => {
// cy.visit("/login");
// //via UI
// // before(() => {
// // cy.visit("/login");
// cy.get("input[name=username]").clear().type(Cypress.env("adminusername"));
// // cy.get("input[name=username]").clear().type(Cypress.env("adminusername"));
// // {enter} causes the form to submit
// cy.get("input[name=password]")
// .clear()
// .type(`${Cypress.env("adminpassword")}{enter}`);
// cy.url().should("include", "/ay-evaluate");
// // // {enter} causes the form to submit
// // cy.get("input[name=password]")
// // .clear()
// // .type(`${Cypress.env("adminpassword")}{enter}`);
// // cy.url().should("include", "/ay-evaluate");
// cy.get("[data-cy=btnSeed]").click();
// cy.get("[data-cy=btnStart]").click();
// cy.get('[data-cy="gzconfirm:yesbutton"]').click();
// //cy.contains("permanently erase");
// cy.get('[data-cy="gzconfirm:yesbutton"]').click();
// //long delay here while data is being generated
// cy.url({ timeout: 300000 }).should("include", "/login");
// });
// // cy.get("[data-cy=btnSeed]").click();
// // cy.get("[data-cy=btnStart]").click();
// // cy.get('[data-cy="gzconfirm:yesbutton"]').click();
// // //cy.contains("permanently erase");
// // cy.get('[data-cy="gzconfirm:yesbutton"]').click();
// // //long delay here while data is being generated
// // cy.url({ timeout: 300000 }).should("include", "/login");
// // });
//via API
function confirmJobDone(jobId, authToken) {
cy.request({
@@ -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);
// });
// });
// });