diff --git a/src/fmg-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue
index 2a6119681..f1900596b 100644
--- a/src/fmg-components/funnel-footer/funnel-footer.vue
+++ b/src/fmg-components/funnel-footer/funnel-footer.vue
@@ -34,6 +34,7 @@ import buttonMain from "@/ux-components/button-main/button-main";
export default {
name: "funnelFooter",
+ emits: ["BackClicked", "ForwardClicked"], // <--- should remove oodles of warnings in dev tools
props: {
isForwardActionDisabled: Boolean,
isBackButtonHidden: { type: Boolean, default: false },
diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index fbe7aa448..0653e91f0 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -41,6 +41,22 @@ jest.mock(
})
);
+jest.spyOn(baseMixin.methods, "getZipCodeData").mockImplementation((serviceZipCode) => {
+ return new Promise((resolve) => {
+ let mockContainsMilitaryBase = false;
+ if (serviceZipCode === 45433 || serviceZipCode === "45433") {
+ mockContainsMilitaryBase = true;
+ }
+ resolve({
+ containsMilitaryBase: mockContainsMilitaryBase,
+ isValid: true,
+ isServiceable: true,
+ state: "OH",
+ zipCodeCtu: "01820",
+ });
+ });
+});
+
jest.mock("@/store", () => ({
commit: jest.fn(),
dispatch: jest.fn(),
@@ -291,6 +307,24 @@ describe("service-location.vue", () => {
// Assert
expect(wrapper.vm.mobileLocationQuestions).toStrictEqual(newMobileLocationQuestions);
});
+
+ test("displays military zip message when zip is updated", () => {
+ // Arrange
+ const { wrapper } = setupMocks({});
+ wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
+ expect(wrapper.vm.zipContainsMilitaryBase).toBe(false);
+
+ const newServiceZipCodeQuestion = {
+ zipCode: "45433",
+ state: "OH",
+ };
+
+ // Assert
+ wrapper.setData({ zipCode: newServiceZipCodeQuestion.zipCode });
+ wrapper.vm.$nextTick(() => {
+ expect(wrapper.vm.zipContainsMilitaryBase).toBe(true);
+ });
+ });
});
describe("updating mobile location", () => {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index c4944f3ee..b93a8b3b9 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -9,6 +9,11 @@
ref="serviceZipCodeQuestion"
linkWidgetName="ServiceZipLinkWidget"
modalWidgetName="ServiceZipModalWidget" />
+
@@ -27,6 +32,7 @@