Merge pull request #1844 from Safelite/feature/CSR-977

CSR-977

src/constants/experiments.js

@@ -4,7 +4,6 @@ const experimentUniverses = {
 
 const experimentSettings = {
     GOOGLE_CUSTOM_DIMENSION_INDEX: "Google Custom Dimension Index",
-    SUPPRESS_VIN_CAPTURE: "SuppressVinCapture",
     DISPLAY_AVAILABILITY_INDICATORS: "DisplayAvailabilityIndicators",
     PIA_EXPERIENCE: "PIA Experience",
     PIA_INSURANCE: "DisplayPIAInsurance",

src/helpers/heritage-integration/navigation-helper.js

@@ -5,9 +5,6 @@ import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js"
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { storeActions } from "@/constants/store-actions.js";
-import { settleAllPromises } from "@/helpers/layout-helper";
-import experimentMixin from "@/mixins/experiment-mixin";
-import { experimentSettings } from "@/constants/experiments";
 import { includesWindshieldReplacement } from "@/helpers/damage-helper";
 import store from "@/store";
 import router from "@/router";
@@ -142,11 +139,7 @@ export async function skipVinLookup() {
         ? await store.dispatch(storeActions.IS_VIN_OPTIONAL_VEHICLE)
         : false;
 
-    return (
+    return isVinOptionalVehicle || !includesWindshieldReplacement();
-        isVinOptionalVehicle ||
-        !includesWindshieldReplacement() ||
-        experimentMixin.methods.hasSettingEqualTo(experimentSettings.SUPPRESS_VIN_CAPTURE, "true")
-    );
 }
 
 export async function skipVinLookupNotRepair() {
@@ -158,11 +151,7 @@ export async function skipVinLookupNotRepair() {
         ? await store.dispatch(storeActions.IS_VIN_OPTIONAL_VEHICLE)
         : false;
 
-    return (
+    return isVinOptionalVehicle || !includesWindshieldReplacement();
-        isVinOptionalVehicle ||
-        !includesWindshieldReplacement() ||
-        experimentMixin.methods.hasSettingEqualTo(experimentSettings.SUPPRESS_VIN_CAPTURE, "true")
-    );
 }
 
 async function getLazyLoadedComponent(pageName) {

src/helpers/heritage-integration/navigation-helper.spec.js

@@ -115,16 +115,6 @@ describe("getPageToRouteExistingOrderTo", () => {
             store.commit(storeMutations.UPDATE_IS_REPAIR, false);
             store.commit(storeMutations.UPDATE_MAKE, "acura");
 
-            const mockExperimentsList = [
-                {
-                    universeName: "ConceptFunnel",
-                    settings: {
-                        SuppressVinCapture: false,
-                    },
-                },
-            ];
-            store.commit(storeMutations.UPDATE_EXPERIMENTS, mockExperimentsList);
-
             // Mock out the lazy load calls for all components.
             mockLazyLoadComponentReturnValues({
                 [fmgPageValues.VEHICLE]: true,

src/layouts/estimate/estimate.vue

@@ -112,8 +112,6 @@ import {
     skipVinLookup,
     skipVinLookupNotRepair,
 } from "@/helpers/heritage-integration/navigation-helper";
-import experimentMixin from "@/mixins/experiment-mixin";
-import { experimentSettings } from "@/constants/experiments";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";