From d3515654995215eb8a084814f8a37bb74ef67717 Mon Sep 17 00:00:00 2001 From: Jeremy Zimmerman Date: Wed, 26 Oct 2022 13:19:20 -0400 Subject: [PATCH 1/3] Initial values for Google Tag Manager for ISS. --- azure-pipelines.yml | 3 +++ public/index.html | 10 ++++++++++ vue.config.js | 6 ++++++ vue.release.config.js | 4 ++++ 4 files changed, 23 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index caca6e33..7aa73313 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -78,5 +78,8 @@ stages: appDeployVariables: __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__) __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__) + indexDeployVariables: + __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__) + __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__) cfDistributionId: $(cfDistributionId) \ No newline at end of file diff --git a/public/index.html b/public/index.html index 3e5a1396..5f556395 100644 --- a/public/index.html +++ b/public/index.html @@ -1,6 +1,10 @@ + + @@ -8,6 +12,12 @@ <%= htmlWebpackPlugin.options.title %> + + + diff --git a/vue.config.js b/vue.config.js index 97730661..f5be82e4 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,6 +1,12 @@ process.env.VUE_APP_CONSUMER_CF_DISTRO ="https://digitalapi.dev.safelite.io"; process.env.VUE_APP_CURRENT_ENVIRONMENT = "Localhost"; + +// GA & GTM +// NOTE: Using the old ISS site GTM Cotnainer ID for now, will create a new one soon. +process.env.VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY = "(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl+ '>m_auth=amlAYNhxUxuskQo7jmjadg>m_preview=env-38>m_cookies_win=x';f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','GTM-KKNWZ3');"; +process.env.VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC = "https://www.googletagmanager.com/ns.html?id=GTM-KKNWZ3>m_auth=amlAYNhxUxuskQo7jmjadg>m_preview=env-38>m_cookies_win=x"; + module.exports = { publicPath: "/", css: { diff --git a/vue.release.config.js b/vue.release.config.js index 49511e62..93af085c 100644 --- a/vue.release.config.js +++ b/vue.release.config.js @@ -1,6 +1,10 @@ process.env.VUE_APP_CONSUMER_CF_DISTRO = "__VUE_APP_CONSUMER_CF_DISTRO__"; process.env.VUE_APP_CURRENT_ENVIRONMENT = "__VUE_APP_CURRENT_ENVIRONMENT__"; +// GA & GTM +process.env.VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY = "__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__"; +process.env.VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC = "__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__" + module.exports = { publicPath: "/", css: { From b90499a35388d1f1418425bfbe2e742bae456622 Mon Sep 17 00:00:00 2001 From: Jeremy Zimmerman Date: Wed, 26 Oct 2022 14:06:41 -0400 Subject: [PATCH 2/3] Updating tag script. --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index f5be82e4..3c474a35 100644 --- a/vue.config.js +++ b/vue.config.js @@ -4,7 +4,7 @@ process.env.VUE_APP_CURRENT_ENVIRONMENT = "Localhost"; // GA & GTM // NOTE: Using the old ISS site GTM Cotnainer ID for now, will create a new one soon. -process.env.VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY = "(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl+ '>m_auth=amlAYNhxUxuskQo7jmjadg>m_preview=env-38>m_cookies_win=x';f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','GTM-KKNWZ3');"; +process.env.VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY = "(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','GTM-KKNWZ3');"; process.env.VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC = "https://www.googletagmanager.com/ns.html?id=GTM-KKNWZ3>m_auth=amlAYNhxUxuskQo7jmjadg>m_preview=env-38>m_cookies_win=x"; module.exports = { From cf0cfcf00122bd2016cef5dc8d14e84fe08eb1e9 Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Thu, 27 Oct 2022 11:31:52 -0400 Subject: [PATCH 3/3] Updated test descriptions --- src/common-components/vehicle-banner/vehicle-banner.spec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common-components/vehicle-banner/vehicle-banner.spec.js b/src/common-components/vehicle-banner/vehicle-banner.spec.js index 14c5a318..f36dd257 100644 --- a/src/common-components/vehicle-banner/vehicle-banner.spec.js +++ b/src/common-components/vehicle-banner/vehicle-banner.spec.js @@ -42,7 +42,7 @@ const mockMixin = { describe("vehicleBanner", () => { - test("renders the blurrycar image", async () => { + test("renders the blurrycar image when displayGenericVehicleImage is true", async () => { const wrapper = shallowMount(vehicleBanner, { propsData: { @@ -75,7 +75,7 @@ describe("vehicleBanner", () => { }); - test("should render car icon when imageUrl is null and category is default", async () => { + test("should render default car icon when imageUrl is null and category is default", async () => { store.order.vehicle.imageUrl = null; @@ -101,7 +101,7 @@ describe("vehicleBanner", () => { ["SUV", "suv-placeholder.jpg"], ["OTHER", "car-placeholder.jpg"]]; - test.each(params)("renders an icon instead of an image for %s and %s", async (category, expectedIcon) => { + test.each(params)("renders correct icon when imageUrl is not populated for %s and %s", async (category, expectedIcon) => { store.order.vehicle.imageUrl = null; store.order.vehicle.category = category;