Merge pull request #1761 from alphagov/revert-1744-add-ga-param-for-ask

Revert "Add GA params to /ask survey link"

app/assets/javascripts/application.js

@@ -1,21 +1,11 @@
 //= require_tree ./modules
 //= require govuk_publishing_components/all_components
-//= require set-ga-client-id-on-url-in-element
+//= require set-ga-client-id-on-form
 
 jQuery(function ($) {
   var $form = $('.js-service-sign-in-form')
-  if ($form.length) {
-    new GOVUK.SetGaClientIdOnUrlInElement({
-      $linkedElement: $form,
-      attribute: 'action'
-    })
-  }
 
-  if ($(location).attr('pathname') === '/ask') {
-    var $link = $('[href="https://www.smartsurvey.co.uk/ss/govuk-coronavirus-ask/"]')
-    new GOVUK.SetGaClientIdOnUrlInElement({
-      $linkedElement: $link,
-      attribute: 'href'
-    })
+  if ($form.length) {
+    new GOVUK.SetGaClientIdOnForm({ $form: $form })
   }
 })

app/assets/javascripts/set-ga-client-id-on-form.js

@@ -0,0 +1,20 @@
+(function () {
+  'use strict'
+
+  window.GOVUK = window.GOVUK || {}
+  var GOVUK = window.GOVUK
+
+  function SetGaClientIdOnForm (options) {
+    if (!options.$form || !window.ga) { return }
+
+    var form = options.$form
+
+    window.ga(function(tracker) {
+      var clientId = tracker.get('clientId')
+      var action = form.attr('action')
+      form.attr('action', action + "?_ga=" + clientId)
+    });
+  }
+
+  GOVUK.SetGaClientIdOnForm = SetGaClientIdOnForm
+})(window, window.GOVUK);

spec/javascripts/set-ga-client-id-on-form.spec.js

@@ -0,0 +1,23 @@
+/* global describe beforeEach it expect */
+
+var $ = window.jQuery
+
+describe('SetGaClientIdOnForm', function () {
+
+  var GOVUK = window.GOVUK
+  var tracker = { clientId: 'clientId' }
+  tracker.get = function(arg) { return this[arg] }
+  window.ga = function(callback) { callback(tracker) }
+  var form
+
+  beforeEach(function () {
+    form = $(
+      '<form class="js-service-sign-in-form" action="/endpoint"></form>'
+    )
+    setter = new GOVUK.SetGaClientIdOnForm({ $form: form })
+  })
+
+  it('sets the _ga client id as a query param on the form action', function () {
+    expect(form.attr('action')).toBe('/endpoint?_ga=clientId')
+  })
+})