Skip to content

Commit

Permalink
merge with develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Sarah Thompson authored and Sarah Thompson committed May 1, 2019
2 parents c41b5c7 + 56bf521 commit bf32275
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
12 changes: 6 additions & 6 deletions cypress/integration/guided_experience_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe("Guided Experience", function() {
cy.url().should("include", "benefits-directory");
});

it("can choose some options and get to summary and benefits directory", () => {
it("can choose some options and get to benefits directory", () => {
cy.contains(patronTypeVeteran).click();
cy.get("#nextButton").click();
cy.url().should("include", "serviceType?");
Expand All @@ -29,9 +29,9 @@ describe("Guided Experience", function() {
cy.contains(patronTypeVeteran);
});

it("can go back from summary and edit answer", () => {
cy.visit("summary");
cy.get("#edit-patronType").click();
cy.contains("Select who would be receiving the benefits.");
});
// it("can go back from summary and edit answer", () => {
// cy.visit("summary");
// cy.get("#edit-patronType").click();
// cy.contains("Select who would be receiving the benefits.");
// });
});
4 changes: 4 additions & 0 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ Promise.resolve(getAllData()).then(allData => {
res
.status(404)
.send("The Favourites page only exists on the staging app.");
} else if (req.url.includes("summary") && !staging) {
res
.status(404)
.send("The summary page only exists on the staging app.");
} else {
const favouriteBenefits = new Cookies(req.headers.cookie).get(
"favouriteBenefits"
Expand Down

0 comments on commit bf32275

Please sign in to comment.