Remove custom VPV javascript (covered by FE toolkit)

Crown-Commercial-Service · Apr 11, 2018 · 06dbe2b · 06dbe2b
1 parent 90c1030
commit 06dbe2b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 53 deletions.
diff --git a/app/assets/javascripts/_analytics.js b/app/assets/javascripts/_analytics.js
@@ -3,4 +3,3 @@
 // TODO: move remaining shared analytics code into FE toolkit
 //= include analytics/_events.js
 //= include analytics/_pageViews.js
-//= include analytics/_virtualPageViews.js
diff --git a/spec/javascripts/manifest.js b/spec/javascripts/manifest.js
@@ -5,10 +5,10 @@ var manifest = {
     '../../../node_modules/govuk_frontend_toolkit/javascripts/govuk/analytics/google-analytics-universal-tracker.js',
     '../../../node_modules/govuk_frontend_toolkit/javascripts/govuk/analytics/analytics.js',
     '../../../node_modules/digitalmarketplace-frontend-toolkit/toolkit/javascripts/analytics/_register.js',
+    '../../../node_modules/digitalmarketplace-frontend-toolkit/toolkit/javascripts/analytics/_virtualPageViews.js',
     '../../../node_modules/digitalmarketplace-frontend-toolkit/toolkit/javascripts/analytics/_init.js',
     '../../../app/assets/javascripts/analytics/_pageViews.js',
-    '../../../app/assets/javascripts/analytics/_events.js',
-    '../../../app/assets/javascripts/analytics/_virtualPageViews.js',
+    '../../../app/assets/javascripts/analytics/_events.js'
   ],
   test : [
     '../unit/AnalyticsSpec.js'

diff --git a/spec/javascripts/unit/AnalyticsSpec.js b/spec/javascripts/unit/AnalyticsSpec.js
@@ -156,11 +156,19 @@ describe("GOVUK.Analytics", function () {
         expect(window.ga.calls.any()).toEqual(false);
       });
 
-      it("Should call google analytics if url exists", function () {
-        $analyticsString = $("<div data-analytics='trackPageView' data-url='http://example.com'/>");
+      it("Should call google analytics if application submitted", function () {
+        $analyticsString = $("<div data-analytics='trackPageView' data-url='/suppliers/opportunities/1234/responses/result?result=success' />");
         $(document.body).append($analyticsString);
         window.GOVUK.GDM.analytics.virtualPageViews();
-        expect(window.ga.calls.first().args).toEqual([ 'send', 'pageview', { page: 'http://example.com/vpv' } ]);
+        expect(window.ga.calls.first().args).toEqual([ 'send', 'pageview', { page: '/suppliers/opportunities/1234/responses/result/vpv?result=success' } ]);
+        expect(window.ga.calls.count()).toEqual(1);
+      });
+
+      it("Should call google analytics if clarification question submitted", function () {
+        $analyticsString = $("<div data-analytics='trackPageView' data-url='/suppliers/opportunities/1234/ask-a-question?submitted=true'/>");
+        $(document.body).append($analyticsString);
+        window.GOVUK.GDM.analytics.virtualPageViews();
+        expect(window.ga.calls.first().args).toEqual([ 'send', 'pageview', { page: '/suppliers/opportunities/1234/ask-a-question/vpv?submitted=true' } ]);
         expect(window.ga.calls.count()).toEqual(1);
       });
 
@@ -179,53 +187,6 @@ describe("GOVUK.Analytics", function () {
       });
     });
 
-    describe("When the clarification question for an opportunity page is loaded", function () {
-      var $form,
-          $content;
-
-      beforeEach(function () {
-        $content = $('<div id="content" />');
-        $form = $('<form />');
-        $content.append($form);
-        $(document.body).append($content);
-      });
-
-      afterEach(function () {
-        $content.remove();
-      });
-
-      it("Should not send a pageview if question not sent", function () {
-        $form.attr('data-message-sent', 'false');
-
-        spyOn(GOVUK.GDM.analytics.location, "pathname")
-          .and
-          .callFake(function () {
-            return "/suppliers/opportunities/1/ask-a-question";
-        });
-        window.GOVUK.GDM.analytics.virtualPageViews();
-        expect(window.ga.calls.any()).toEqual(false);
-      });
-
-      it("Should send a pageview with a query string if question sent", function () {
-        $form.attr('data-message-sent', 'true');
-
-        spyOn(GOVUK.GDM.analytics.location, "pathname")
-          .and
-          .callFake(function () {
-            return "/suppliers/opportunities/1/ask-a-question";
-        });
-
-        spyOn(GOVUK.GDM.analytics.location, "href")
-          .and
-          .callFake(function () {
-            return "https://www.digitalmarketplace.service.gov.uk/suppliers/opportunities/1/ask-a-question";
-        });
-        window.GOVUK.GDM.analytics.virtualPageViews();
-
-        expect(window.ga.calls.first().args).toEqual([ 'send', 'pageview', { page: "/suppliers/opportunities/1/ask-a-question?submitted=true" } ]);
-      });
-    });
-
   });
 
   describe("Supplier eligible to apply for brief", function() {