From 0d751df561a34e19ab329dd62092956cb63d152f Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Thu, 14 May 2015 13:01:33 +0100 Subject: [PATCH 1/5] Remove classic analytics Google Analytics classic data collection techniques are being deprecated by Google. We no longer need to support classic and any new tracking should use only Universal. --- app/assets/javascripts/analytics.js | 3 +- app/assets/javascripts/analytics/init.js | 3 +- .../javascripts/analytics/static-tracker.js | 44 ++++++++--------- .../analytics/static-tracker-spec.js | 47 +++---------------- 4 files changed, 31 insertions(+), 66 deletions(-) diff --git a/app/assets/javascripts/analytics.js b/app/assets/javascripts/analytics.js index abbf4a8d8..4c3883ef9 100644 --- a/app/assets/javascripts/analytics.js +++ b/app/assets/javascripts/analytics.js @@ -1,6 +1,5 @@ //= require govuk/analytics/google-analytics-universal-tracker -//= require govuk/analytics/google-analytics-classic-tracker -//= require govuk/analytics/tracker +//= require govuk/analytics/analytics //= require govuk/analytics/print-intent //= require govuk/analytics/error-tracking diff --git a/app/assets/javascripts/analytics/init.js b/app/assets/javascripts/analytics/init.js index 16f9ba687..527f9dcec 100644 --- a/app/assets/javascripts/analytics/init.js +++ b/app/assets/javascripts/analytics/init.js @@ -10,8 +10,7 @@ // Configure profiles, setup custom vars, track initial pageview var analytics = new GOVUK.StaticTracker({ - universalId: 'UA-26179049-7', - classicId: 'UA-26179049-1', + universalId: 'UA-26179049-1', cookieDomain: cookieDomain }); diff --git a/app/assets/javascripts/analytics/static-tracker.js b/app/assets/javascripts/analytics/static-tracker.js index 8b951c779..94bda7e63 100644 --- a/app/assets/javascripts/analytics/static-tracker.js +++ b/app/assets/javascripts/analytics/static-tracker.js @@ -4,11 +4,11 @@ var StaticTracker = function(config) { - // Create universal and classic analytics tracker + // Create universal tracker // https://github.com/alphagov/govuk_frontend_toolkit/blob/master/docs/analytics.md - // https://github.com/alphagov/govuk_frontend_toolkit/blob/master/javascripts/govuk/analytics/tracker.js - var tracker = new GOVUK.Tracker(config); - this.tracker = tracker; + // https://github.com/alphagov/govuk_frontend_toolkit/blob/master/javascripts/govuk/analytics/analytics.js + var analytics = new GOVUK.Analytics(config); + this.analytics = analytics; setPixelDensityDimension(); setHTTPStatusCodeDimension(); @@ -16,7 +16,7 @@ this.callMethodRequestedByPreviousPage(); // Track initial pageview - tracker.trackPageview(); + analytics.trackPageview(); // Begin error and print tracking GOVUK.analyticsPlugins.error(); @@ -24,12 +24,12 @@ function setPixelDensityDimension() { if (window.devicePixelRatio) { - tracker.setDimension(11, window.devicePixelRatio, 'Pixel Ratio', 2); + analytics.setDimension(11, window.devicePixelRatio); } } function setHTTPStatusCodeDimension() { - tracker.setDimension(15, window.httpStatusCode || 200, 'httpStatusCode'); + analytics.setDimension(15, window.httpStatusCode || 200); } }; @@ -66,7 +66,7 @@ }; StaticTracker.load = function() { - GOVUK.Tracker.load(); + GOVUK.Analytics.load(); }; StaticTracker.prototype.setDimensionsFromMetaTags = function() { @@ -93,11 +93,11 @@ }; StaticTracker.prototype.trackPageview = function(path, title) { - this.tracker.trackPageview(path, title); + this.analytics.trackPageview(path, title); }; StaticTracker.prototype.trackEvent = function(category, action, options) { - this.tracker.trackEvent(category, action, options); + this.analytics.trackEvent(category, action, options); }; StaticTracker.prototype.setDimension = function(index, value, name, scope) { @@ -105,47 +105,47 @@ return; } - this.tracker.setDimension(index, value, name, scope); + this.analytics.setDimension(index, value, name, scope); }; StaticTracker.prototype.trackShare = function(network) { - this.tracker.trackShare(network); + this.analytics.trackShare(network); }; StaticTracker.prototype.addLinkedTrackerDomain = function(trackerId, name, domain) { - this.tracker.addLinkedTrackerDomain(trackerId, name, domain); + this.analytics.addLinkedTrackerDomain(trackerId, name, domain); }; StaticTracker.prototype.setSectionDimension = function(section) { - this.setDimension(1, section, 'Section'); + this.setDimension(1, section); }; StaticTracker.prototype.setFormatDimension = function(format) { - this.setDimension(2, format, 'Format'); + this.setDimension(2, format); }; StaticTracker.prototype.setNeedIDsDimension = function(ids) { - this.setDimension(3, ids, 'NeedID'); + this.setDimension(3, ids); }; StaticTracker.prototype.setResultCountDimension = function(count) { - this.setDimension(5, count, 'ResultCount'); + this.setDimension(5, count); }; StaticTracker.prototype.setPublishingGovernmentDimension = function(government) { - this.setDimension(6, government, 'PublishingGovernment'); + this.setDimension(6, government); }; StaticTracker.prototype.setPoliticalStatusDimension = function(status) { - this.setDimension(7, status, 'PoliticalStatus'); + this.setDimension(7, status); }; StaticTracker.prototype.setOrganisationsDimension = function(orgs) { - this.setDimension(9, orgs, 'Organisations'); + this.setDimension(9, orgs); }; StaticTracker.prototype.setWorldLocationsDimension = function(locations) { - this.setDimension(10, locations, 'WorldLocations'); + this.setDimension(10, locations); }; StaticTracker.prototype.setRenderingApplicationDimension = function(app) { @@ -153,7 +153,7 @@ }; StaticTracker.prototype.setSearchPositionDimension = function(position) { - this.setDimension(21, position, 'searchPosition'); + this.setDimension(21, position); }; GOVUK.StaticTracker = StaticTracker; diff --git a/spec/javascripts/analytics/static-tracker-spec.js b/spec/javascripts/analytics/static-tracker-spec.js index 8f07af57b..0fa8bcbb9 100644 --- a/spec/javascripts/analytics/static-tracker-spec.js +++ b/spec/javascripts/analytics/static-tracker-spec.js @@ -2,14 +2,12 @@ describe("GOVUK.StaticTracker", function() { var tracker; beforeEach(function() { - window._gaq = []; window.ga = function() {}; spyOn(window, 'ga'); spyOn(GOVUK.analyticsPlugins, 'printIntent'); spyOn(GOVUK.analyticsPlugins, 'error'); tracker = new GOVUK.StaticTracker({ universalId: 'universal-id', - classicId: 'classic-id', cookieDomain: '.www.gov.uk' }); }); @@ -21,24 +19,19 @@ describe("GOVUK.StaticTracker", function() { universalSetupArguments = window.ga.calls.allArgs(); }); - it('configures classic and universal trackers', function() { - expect(window._gaq[0]).toEqual(['_setAccount', 'classic-id']); - expect(window._gaq[1]).toEqual(['_setDomainName', '.www.gov.uk']); + it('configures a universal tracker', function() { expect(universalSetupArguments[0]).toEqual(['create', 'universal-id', {'cookieDomain': '.www.gov.uk'}]); }); it('sets the device pixel ratio', function() { - expect(window._gaq[4][2]).toEqual('Pixel Ratio'); expect(universalSetupArguments[2][1]).toEqual('dimension11'); }); it('sets the HTTP status code', function() { - expect(window._gaq[5][2]).toEqual('httpStatusCode'); expect(universalSetupArguments[3][1]).toEqual('dimension15'); }); - it('tracks a pageview in both classic and universal', function() { - expect(window._gaq[6]).toEqual(['_trackPageview']); + it('tracks a pageview in universal', function() { expect(universalSetupArguments[4]).toEqual(['send', 'pageview']); }); @@ -53,7 +46,6 @@ describe("GOVUK.StaticTracker", function() { describe('when there are govuk: meta tags', function() { beforeEach(function() { window.ga.calls.reset(); - window._gaq = []; }); afterEach(function() { @@ -73,31 +65,16 @@ describe("GOVUK.StaticTracker", function() { \ '); - tracker = new GOVUK.StaticTracker({universalId: 'universal-id', classicId: 'classic-id'}); + tracker = new GOVUK.StaticTracker({universalId: 'universal-id'}); universalSetupArguments = window.ga.calls.allArgs(); - expect(window._gaq[6]).toEqual(['_setCustomVar', 1, 'Section', 'section', 3]); expect(universalSetupArguments[4]).toEqual(['set', 'dimension1', 'section']); - - expect(window._gaq[7]).toEqual(['_setCustomVar', 2, 'Format', 'format', 3]); expect(universalSetupArguments[5]).toEqual(['set', 'dimension2', 'format']); - - expect(window._gaq[8]).toEqual(['_setCustomVar', 3, 'NeedID', '1,2,3', 3]); expect(universalSetupArguments[6]).toEqual(['set', 'dimension3', '1,2,3']); - - expect(window._gaq[9]).toEqual(['_setCustomVar', 5, 'ResultCount', '1000', 3]); expect(universalSetupArguments[7]).toEqual(['set', 'dimension5', '1000']); - - expect(window._gaq[10]).toEqual(['_setCustomVar', 6, 'PublishingGovernment', '2005-to-2010-labour-government', 3]); expect(universalSetupArguments[8]).toEqual(['set', 'dimension6', '2005-to-2010-labour-government']); - - expect(window._gaq[11]).toEqual(['_setCustomVar', 7, 'PoliticalStatus', 'historic', 3]); expect(universalSetupArguments[9]).toEqual(['set', 'dimension7', 'historic']); - - expect(window._gaq[12]).toEqual(['_setCustomVar', 9, 'Organisations', '', 3]); expect(universalSetupArguments[10]).toEqual(['set', 'dimension9', '']); - - expect(window._gaq[13]).toEqual(['_setCustomVar', 10, 'WorldLocations', '', 3]); expect(universalSetupArguments[11]).toEqual(['set', 'dimension10', '']); }); @@ -105,43 +82,33 @@ describe("GOVUK.StaticTracker", function() { $('head').append(''); - tracker = new GOVUK.StaticTracker({universalId: 'universal-id', classicId: 'classic-id'}); + tracker = new GOVUK.StaticTracker({universalId: 'universal-id'}); universalSetupArguments = window.ga.calls.allArgs(); - expect(window._gaq[6]).toEqual(['_setCustomVar', 1, 'Section', 'section', 3]); expect(universalSetupArguments[4]).toEqual(['set', 'dimension1', 'section']); - - expect(window._gaq[7]).toEqual(['_trackPageview']); expect(universalSetupArguments[5]).toEqual(['send', 'pageview']); }); }); }); describe('when tracking pageviews, events and custom dimensions', function() { - it('tracks in both classic and universal', function() { - window._gaq = []; + it('tracks them in universal', function() { + tracker.trackPageview('/path', 'Title'); - expect(window._gaq[0]).toEqual(['_trackPageview', '/path']); expect(window.ga.calls.mostRecent().args).toEqual(['send', 'pageview', {page: '/path', title: 'Title'}]); - window._gaq = []; tracker.trackEvent('category', 'action'); - expect(window._gaq[0]).toEqual(['_trackEvent', 'category', 'action']); expect(window.ga.calls.mostRecent().args).toEqual(['send', {hitType: 'event', eventCategory: 'category', eventAction: 'action'}]); - window._gaq = []; tracker.setSectionDimension('value'); - expect(window._gaq[0]).toEqual(['_setCustomVar', 1, 'Section', 'value', 3]); expect(window.ga.calls.mostRecent().args).toEqual(['set', 'dimension1', 'value']); }); }); describe('when tracking social media shares', function() { - it('tracks in both classic and universal', function() { - window._gaq = []; + it('tracks them in universal', function() { tracker.trackShare('network'); - expect(window._gaq[0]).toEqual(['_trackSocial', 'network', 'share', jasmine.any(String)]); expect(window.ga.calls.mostRecent().args).toEqual(['send', { hitType: 'social', socialNetwork: 'network', From 059f6a534b595c543852c25ced151019b2b6cd72 Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Thu, 14 May 2015 13:04:50 +0100 Subject: [PATCH 2/5] Rename StaticTracker to StaticAnalytics The Tracker object was renamed in frontend_toolkit, update the StaticTracker object to correspond. --- app/assets/javascripts/analytics/init.js | 4 +- .../javascripts/analytics/static-tracker.js | 44 +++++++++---------- .../analytics/static-tracker-spec.js | 36 +++++++-------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/app/assets/javascripts/analytics/init.js b/app/assets/javascripts/analytics/init.js index 527f9dcec..14b3f1a14 100644 --- a/app/assets/javascripts/analytics/init.js +++ b/app/assets/javascripts/analytics/init.js @@ -2,14 +2,14 @@ "use strict"; // Load Google Analytics libraries - GOVUK.StaticTracker.load(); + GOVUK.StaticAnalytics.load(); // Use document.domain in dev, preview and staging so that tracking works // Otherwise explicitly set the domain as www.gov.uk (and not gov.uk). var cookieDomain = (document.domain == 'www.gov.uk') ? '.www.gov.uk' : document.domain; // Configure profiles, setup custom vars, track initial pageview - var analytics = new GOVUK.StaticTracker({ + var analytics = new GOVUK.StaticAnalytics({ universalId: 'UA-26179049-1', cookieDomain: cookieDomain }); diff --git a/app/assets/javascripts/analytics/static-tracker.js b/app/assets/javascripts/analytics/static-tracker.js index 94bda7e63..41d52b368 100644 --- a/app/assets/javascripts/analytics/static-tracker.js +++ b/app/assets/javascripts/analytics/static-tracker.js @@ -2,7 +2,7 @@ "use strict"; window.GOVUK = window.GOVUK || {}; - var StaticTracker = function(config) { + var StaticAnalytics = function(config) { // Create universal tracker // https://github.com/alphagov/govuk_frontend_toolkit/blob/master/docs/analytics.md @@ -34,7 +34,7 @@ }; - StaticTracker.prototype.callOnNextPage = function(method, params) { + StaticAnalytics.prototype.callOnNextPage = function(method, params) { params = params || []; if (!$.isArray(params)) { @@ -47,7 +47,7 @@ } }; - StaticTracker.prototype.callMethodRequestedByPreviousPage = function() { + StaticAnalytics.prototype.callMethodRequestedByPreviousPage = function() { if (GOVUK.cookie && GOVUK.cookie('analytics_next_page_call') !== null) { var params, method; @@ -65,11 +65,11 @@ } }; - StaticTracker.load = function() { + StaticAnalytics.load = function() { GOVUK.Analytics.load(); }; - StaticTracker.prototype.setDimensionsFromMetaTags = function() { + StaticAnalytics.prototype.setDimensionsFromMetaTags = function() { var $metas = $('meta[name^="govuk:"]'), dimensions = {}; @@ -92,15 +92,15 @@ this.setRenderingApplicationDimension(dimensions['rendering-application']); }; - StaticTracker.prototype.trackPageview = function(path, title) { + StaticAnalytics.prototype.trackPageview = function(path, title) { this.analytics.trackPageview(path, title); }; - StaticTracker.prototype.trackEvent = function(category, action, options) { + StaticAnalytics.prototype.trackEvent = function(category, action, options) { this.analytics.trackEvent(category, action, options); }; - StaticTracker.prototype.setDimension = function(index, value, name, scope) { + StaticAnalytics.prototype.setDimension = function(index, value, name, scope) { if (typeof value === "undefined") { return; } @@ -108,53 +108,53 @@ this.analytics.setDimension(index, value, name, scope); }; - StaticTracker.prototype.trackShare = function(network) { + StaticAnalytics.prototype.trackShare = function(network) { this.analytics.trackShare(network); }; - StaticTracker.prototype.addLinkedTrackerDomain = function(trackerId, name, domain) { + StaticAnalytics.prototype.addLinkedTrackerDomain = function(trackerId, name, domain) { this.analytics.addLinkedTrackerDomain(trackerId, name, domain); }; - StaticTracker.prototype.setSectionDimension = function(section) { + StaticAnalytics.prototype.setSectionDimension = function(section) { this.setDimension(1, section); }; - StaticTracker.prototype.setFormatDimension = function(format) { + StaticAnalytics.prototype.setFormatDimension = function(format) { this.setDimension(2, format); }; - StaticTracker.prototype.setNeedIDsDimension = function(ids) { + StaticAnalytics.prototype.setNeedIDsDimension = function(ids) { this.setDimension(3, ids); }; - StaticTracker.prototype.setResultCountDimension = function(count) { + StaticAnalytics.prototype.setResultCountDimension = function(count) { this.setDimension(5, count); }; - StaticTracker.prototype.setPublishingGovernmentDimension = function(government) { + StaticAnalytics.prototype.setPublishingGovernmentDimension = function(government) { this.setDimension(6, government); }; - StaticTracker.prototype.setPoliticalStatusDimension = function(status) { + StaticAnalytics.prototype.setPoliticalStatusDimension = function(status) { this.setDimension(7, status); }; - StaticTracker.prototype.setOrganisationsDimension = function(orgs) { + StaticAnalytics.prototype.setOrganisationsDimension = function(orgs) { this.setDimension(9, orgs); }; - StaticTracker.prototype.setWorldLocationsDimension = function(locations) { + StaticAnalytics.prototype.setWorldLocationsDimension = function(locations) { this.setDimension(10, locations); }; - StaticTracker.prototype.setRenderingApplicationDimension = function(app) { - this.setDimension(20, app, 'RenderingApps'); + StaticAnalytics.prototype.setRenderingApplicationDimension = function(app) { + this.setDimension(20, app); }; - StaticTracker.prototype.setSearchPositionDimension = function(position) { + StaticAnalytics.prototype.setSearchPositionDimension = function(position) { this.setDimension(21, position); }; - GOVUK.StaticTracker = StaticTracker; + GOVUK.StaticAnalytics = StaticAnalytics; })(); diff --git a/spec/javascripts/analytics/static-tracker-spec.js b/spec/javascripts/analytics/static-tracker-spec.js index 0fa8bcbb9..2c020757c 100644 --- a/spec/javascripts/analytics/static-tracker-spec.js +++ b/spec/javascripts/analytics/static-tracker-spec.js @@ -1,12 +1,12 @@ -describe("GOVUK.StaticTracker", function() { - var tracker; +describe("GOVUK.StaticAnalytics", function() { + var analytics; beforeEach(function() { window.ga = function() {}; spyOn(window, 'ga'); spyOn(GOVUK.analyticsPlugins, 'printIntent'); spyOn(GOVUK.analyticsPlugins, 'error'); - tracker = new GOVUK.StaticTracker({ + analytics = new GOVUK.StaticAnalytics({ universalId: 'universal-id', cookieDomain: '.www.gov.uk' }); @@ -65,7 +65,7 @@ describe("GOVUK.StaticTracker", function() { \ '); - tracker = new GOVUK.StaticTracker({universalId: 'universal-id'}); + analytics = new GOVUK.StaticAnalytics({universalId: 'universal-id'}); universalSetupArguments = window.ga.calls.allArgs(); expect(universalSetupArguments[4]).toEqual(['set', 'dimension1', 'section']); @@ -82,7 +82,7 @@ describe("GOVUK.StaticTracker", function() { $('head').append(''); - tracker = new GOVUK.StaticTracker({universalId: 'universal-id'}); + analytics = new GOVUK.StaticAnalytics({universalId: 'universal-id'}); universalSetupArguments = window.ga.calls.allArgs(); expect(universalSetupArguments[4]).toEqual(['set', 'dimension1', 'section']); @@ -94,20 +94,20 @@ describe("GOVUK.StaticTracker", function() { describe('when tracking pageviews, events and custom dimensions', function() { it('tracks them in universal', function() { - tracker.trackPageview('/path', 'Title'); + analytics.trackPageview('/path', 'Title'); expect(window.ga.calls.mostRecent().args).toEqual(['send', 'pageview', {page: '/path', title: 'Title'}]); - tracker.trackEvent('category', 'action'); + analytics.trackEvent('category', 'action'); expect(window.ga.calls.mostRecent().args).toEqual(['send', {hitType: 'event', eventCategory: 'category', eventAction: 'action'}]); - tracker.setSectionDimension('value'); + analytics.setSectionDimension('value'); expect(window.ga.calls.mostRecent().args).toEqual(['set', 'dimension1', 'value']); }); }); describe('when tracking social media shares', function() { it('tracks them in universal', function() { - tracker.trackShare('network'); + analytics.trackShare('network'); expect(window.ga.calls.mostRecent().args).toEqual(['send', { hitType: 'social', @@ -125,24 +125,24 @@ describe("GOVUK.StaticTracker", function() { describe('and the method exists', function() { it('sets a cookie with the method name', function() { - tracker.callOnNextPage('trackPageview'); + analytics.callOnNextPage('trackPageview'); expect(GOVUK.cookie).toHaveBeenCalledWith('analytics_next_page_call', '["trackPageview"]'); }); it('sets a cookie with the parameters to call', function() { - tracker.callOnNextPage('trackPageview', ['/path', 'Custom Title']); + analytics.callOnNextPage('trackPageview', ['/path', 'Custom Title']); expect(GOVUK.cookie).toHaveBeenCalledWith('analytics_next_page_call', '["trackPageview","/path","Custom Title"]'); }); it('sets a cookie with the single parameter to call', function() { - tracker.callOnNextPage('trackPageview', '/path'); + analytics.callOnNextPage('trackPageview', '/path'); expect(GOVUK.cookie).toHaveBeenCalledWith('analytics_next_page_call', '["trackPageview","/path"]'); }); }); describe('and the method doesn’t exist', function() { it('no cookie is set', function() { - tracker.callOnNextPage('trackPageviewToNowhere'); + analytics.callOnNextPage('trackPageviewToNowhere'); expect(GOVUK.cookie).not.toHaveBeenCalled(); }); }); @@ -150,19 +150,19 @@ describe("GOVUK.StaticTracker", function() { describe('when there is a cookie indicating a method to call', function() { beforeEach(function() { - spyOn(tracker, 'trackPageview'); + spyOn(analytics, 'trackPageview'); }); it('calls the method', function() { spyOn(GOVUK, 'cookie').and.returnValue('["trackPageview"]'); - tracker.callMethodRequestedByPreviousPage(); - expect(tracker.trackPageview).toHaveBeenCalledWith(); + analytics.callMethodRequestedByPreviousPage(); + expect(analytics.trackPageview).toHaveBeenCalledWith(); }); it('calls the method with given parameters', function() { spyOn(GOVUK, 'cookie').and.returnValue('["trackPageview","/path","Title"]'); - tracker.callMethodRequestedByPreviousPage(); - expect(tracker.trackPageview).toHaveBeenCalledWith('/path', 'Title'); + analytics.callMethodRequestedByPreviousPage(); + expect(analytics.trackPageview).toHaveBeenCalledWith('/path', 'Title'); }); }); }); From 01dbaf3c46fb00c9e0fc981e6b1472048712354b Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Tue, 26 May 2015 14:42:12 +0100 Subject: [PATCH 3/5] Bump frontend_toolkit to 4.0.0 Pickup changes that remove Google Analytics classic --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 75b4d0f80..bb2f04d1a 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ end gem 'plek', '1.7.0' -gem 'govuk_frontend_toolkit', '3.5.0' +gem 'govuk_frontend_toolkit', '4.0.0' if ENV['GOVUK_TEMPLATE_DEV'] gem 'govuk_template', :path => "../govuk_template" else diff --git a/Gemfile.lock b/Gemfile.lock index f669ee22f..c400cbdc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM null_logger plek rest-client (~> 1.6.3) - govuk_frontend_toolkit (3.5.0) + govuk_frontend_toolkit (4.0.0) rails (>= 3.1.0) sass (>= 3.2.0) govuk_template (0.13.0) @@ -175,7 +175,7 @@ DEPENDENCIES capybara (= 2.1.0) exception_notification gds-api-adapters (= 7.18.0) - govuk_frontend_toolkit (= 3.5.0) + govuk_frontend_toolkit (= 4.0.0) govuk_template (= 0.13.0) image_optim (= 0.17.1) jasmine-rails (~> 0.10.6) From d5d0788b68fb874fde953a3a5be4cb2557658a7e Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Tue, 26 May 2015 15:24:14 +0100 Subject: [PATCH 4/5] Rename static-tracker.js to static-analytics.js --- app/assets/javascripts/analytics.js | 2 +- .../analytics/{static-tracker.js => static-analytics.js} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename app/assets/javascripts/analytics/{static-tracker.js => static-analytics.js} (100%) diff --git a/app/assets/javascripts/analytics.js b/app/assets/javascripts/analytics.js index 4c3883ef9..0b5b16057 100644 --- a/app/assets/javascripts/analytics.js +++ b/app/assets/javascripts/analytics.js @@ -3,6 +3,6 @@ //= require govuk/analytics/print-intent //= require govuk/analytics/error-tracking -//= require analytics/static-tracker +//= require analytics/static-analytics //= require analytics/init //= require analytics/scroll-tracker diff --git a/app/assets/javascripts/analytics/static-tracker.js b/app/assets/javascripts/analytics/static-analytics.js similarity index 100% rename from app/assets/javascripts/analytics/static-tracker.js rename to app/assets/javascripts/analytics/static-analytics.js From 5b610a1e9ff58a13ab1d81cfdb8f722c455b749e Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Tue, 26 May 2015 15:31:41 +0100 Subject: [PATCH 5/5] Rename static-tracker-spec.js --- .../{static-tracker-spec.js => static-analytics-spec.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename spec/javascripts/analytics/{static-tracker-spec.js => static-analytics-spec.js} (100%) diff --git a/spec/javascripts/analytics/static-tracker-spec.js b/spec/javascripts/analytics/static-analytics-spec.js similarity index 100% rename from spec/javascripts/analytics/static-tracker-spec.js rename to spec/javascripts/analytics/static-analytics-spec.js