jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CSR-98 Fix merge conflict

Browse source
This commit is contained in:
Katie 2022-03-29 12:06:34 -04:00
commit 927811845c
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/helpers/heritage-integration/navigation-helper.js
View file

@ -60,8 +60,6 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita
export async function navigateToHeritageFunnel() {
// Create the order (or save existing order) when navigating to Heritage Funnel.
// console.log(exports)
// await self.saveOrder();
await saveOrder();
router.navigateToExternalUrl(

1
src/helpers/heritage-integration/order-helper.js
View file

@ -10,7 +10,6 @@ import baseMixin from "@/mixins/base-mixin";
*/
export async function loadOrderIfPresent() {
console.log("attempting to load referral....");
// const conceptCookie = self.getConceptCookie();
const conceptCookie = getConceptCookie();
console.log(conceptCookie)

5
src/helpers/heritage-integration/order-helper.spec.js
View file

@ -47,8 +47,7 @@ describe("loadOrderIfPresent", () => {
expect(cookieHelper.getConceptCookie).toHaveBeenCalled();
expect(mocks.baseMixin.methods.dispatchNonBlockingStoreAction).toHaveBeenCalledWith(storeActions.RESET_STATE);
// store.dispatch.mockRestore();
cookieHelper.getConceptCookie.mockRestore();
});
test("Concept cookie is null => store is unchanged", () => {
@ -166,7 +165,7 @@ describe("saveOrder", () => {
// Act
await saveOrder();
// Assert
expect(cookieHelper.getConceptCookie().DidHeritageFunnelUpdateLast).toEqual(false);
});