diff --git a/app/assets/javascripts/analytics/analytics.js b/app/assets/javascripts/analytics/analytics.js index b2d4dea09..711f6ec80 100644 --- a/app/assets/javascripts/analytics/analytics.js +++ b/app/assets/javascripts/analytics/analytics.js @@ -6,10 +6,14 @@ // Stripped-down wrapper for Google Analytics, based on: // https://github.com/alphagov/static/blob/master/doc/analytics.md const Analytics = function (config) { - window.ga('create', config.trackingId, config.cookieDomain, config.name, { 'cookieExpires': config.expires * 24 * 60 * 60 }); + window.ga('create', { + 'trackingId': config.trackingId, + 'cookieDomain': config.cookieDomain, + 'cookieExpires': config.expires * 24 * 60 * 60 + }); window.ga('set', 'anonymizeIp', config.anonymizeIp); - window.ga('set', 'displayFeaturesTask', config.displayFeaturesTask); + window.ga('set', 'allowAdFeatures', config.allowAdFeatures); window.ga('set', 'transport', config.transport); }; diff --git a/app/assets/javascripts/analytics/init.js b/app/assets/javascripts/analytics/init.js index 0a8e012e6..63f8b495a 100644 --- a/app/assets/javascripts/analytics/init.js +++ b/app/assets/javascripts/analytics/init.js @@ -24,9 +24,8 @@ trackingId: trackingId, cookieDomain: 'auto', anonymizeIp: true, - displayFeaturesTask: null, + allowAdFeatures: false, transport: 'beacon', - name: 'GOVUK.analytics', expires: 365 }); diff --git a/tests/javascripts/analytics/analytics.test.js b/tests/javascripts/analytics/analytics.test.js index 28d88d622..ea4b91fe2 100644 --- a/tests/javascripts/analytics/analytics.test.js +++ b/tests/javascripts/analytics/analytics.test.js @@ -29,9 +29,8 @@ describe("Analytics", () => { trackingId: 'UA-75215134-1', cookieDomain: 'auto', anonymizeIp: true, - displayFeaturesTask: null, + allowAdFeatures: false, transport: 'beacon', - name: 'GOVUK.analytics', expires: 365 }); @@ -49,9 +48,9 @@ describe("Analytics", () => { setUpArguments = window.ga.mock.calls; - expect(setUpArguments[0]).toEqual(['create', 'UA-75215134-1', 'auto', 'GOVUK.analytics', { 'cookieExpires': 31536000 }]); + expect(setUpArguments[0]).toEqual(['create', { 'trackingId': 'UA-75215134-1', 'cookieDomain': 'auto', 'cookieExpires': 31536000 }]); expect(setUpArguments[1]).toEqual(['set', 'anonymizeIp', true]); - expect(setUpArguments[2]).toEqual(['set', 'displayFeaturesTask', null]); + expect(setUpArguments[2]).toEqual(['set', 'allowAdFeatures', false]); expect(setUpArguments[3]).toEqual(['set', 'transport', 'beacon']); });