govuk_frontend_toolkit 3.4.2 → 3.5.0

data/app/assets/CHANGELOG.md

@@ -1,3 +1,7 @@
+#3.5.0
+
+- Adds cross domain tracking to Analytics API library: https://github.com/alphagov/govuk_frontend_toolkit/pull/185
+
 #3.4.2
 
 - Fix: Before this fix, when a user fell into variant 0 of a multivariate test,

data/app/assets/VERSION.txt

@@ -1 +1 @@
-3.4.2
+3.5.0

data/app/assets/docs/analytics.md

@@ -160,3 +160,15 @@ Pull `print-intent.js` into your project, and initialise it after analytics (see
 ## Error tracking
 
 Pull `error-tracking.js` into your project, and initialise it after analytics (see [Create an analytics tracker, above](#create-an-analytics-tracker)), to track JavaScript errors.
+
+## Tracking across domains
+
+Once a Tracker instance has been created, tracking across domains can be set up
+for pages like:
+
+```js
+GOVUK.analytics.addLinkedTrackerDomain(trackerIdHere, nameForTracker, domainToLinkTo);
+```
+
+Once this is done hits to that page will be tracked in both your local and the
+named tracker, and sessions will persist to the other domain.

data/app/assets/docs/javascript.md

@@ -89,17 +89,24 @@ The toolkit includes a library for multivariate testing that is capable of repor
 
 #### To create a new experiment
 
-1. Log in to Google Universal Analytics, select "UA - Preview environment".
+1. Log in to Google Universal Analytics, select "UA - 1. GOV.UK(Entire Site - Filtered)".
+
 2. In the left column, click on Behaviour, then Experiments and follow [these instructions](https://support.google.com/analytics/answer/1745152?hl=en-GB) to set up your experiment; you will need to have edit permissions on the Universal Analytics profile. If you cannot see a "Create experiment" button, this means you don't have these permissions; you can ask someone from the Performance Analyst team to set the experiment up for you.
+
 3. In step number 2, in our case the address of the web pages will purely be used as descriptions in reports, so we recommend you pick the addresses accordingly, ie: "www.gov.uk" and "www.gov.uk/?=variation1".
+
 4. In step number 3, "Setting up your experiment code", select "Manually insert the code" and make a note of the Experiment ID number located under the script window.
+
 5. Add the below code to the page you want to test.
-    - the contentExperimentId is the Experiment ID you retrieved in step 3
+    - the contentExperimentId is the Experiment ID you retrieved in step 3.
     - the variantId is 0 for the original variant, 1 for the first modified variant, 2 for the second modified variant, etc.
-    - see section above for other elements
+    - see section above for other elements.
 This code requires analytics to be loaded in order to run; static is the app that would load the analytics by default, which automatically happens before experiments are run.
-6. Check that it works: launch the app, open the page of your app, and check that there is a cookie with the name you had picked in your experiment. You can delete the cookie and refresh the page to check whether you can be assigned to another cohort.
 
+6. Check that it works: launch the app, open the page of your app, and check that there is a cookie with the name you had picked in your experiment. You can delete the cookie and refresh the page to check whether you can be assigned to another cohort. Then in your browser console, go to the Networks tab and search for xid and xvar. The values should correspond to your contentExperimentId and the cohort your cookie indicates you were assigned to.
+
+7. If it works, in Google Universal Analytics, click on "Next Step" and then "Start Experiment". You can ignore the error messages relative to Experiment Code Validation as they don't concern us in our setup.
+ 
 ```js
 var test = new GOVUK.MultivariateTest({
   name: 'car_tax_button_text',

data/app/assets/javascripts/govuk/analytics/google-analytics-universal-tracker.js

@@ -89,6 +89,29 @@
     });
   };
 
+  /*
+   https://developers.google.com/analytics/devguides/collection/analyticsjs/cross-domain
+   trackerId - the UA account code to track the domain against
+   name      - name for the tracker
+   domain    - the domain to track
+  */
+  GoogleAnalyticsUniversalTracker.prototype.addLinkedTrackerDomain = function(trackerId, name, domain) {
+    sendToGa('create',
+             trackerId,
+             'auto',
+             {'name': name});
+    // Load the plugin.
+    sendToGa('require', 'linker');
+    sendToGa(name + '.require', 'linker');
+
+    // Define which domains to autoLink.
+    sendToGa('linker:autoLink', [domain]);
+    sendToGa(name + '.linker:autoLink', [domain]);
+
+    sendToGa(name + '.set', 'anonymizeIp', true);
+    sendToGa(name + '.send', 'pageview');
+  };
+
   // https://developers.google.com/analytics/devguides/collection/analyticsjs/custom-dims-mets
   GoogleAnalyticsUniversalTracker.prototype.setDimension = function(index, value) {
     sendToGa('set', 'dimension' + index, String(value));

data/app/assets/javascripts/govuk/analytics/tracker.js

@@ -46,5 +46,12 @@
     this.classic.setCustomVariable(index, value, name, scope);
   };
 
+  /*
+   Add a beacon to track a page in another GA account on another domain.
+   */
+  Tracker.prototype.addLinkedTrackerDomain = function(trackerId, name, domain) {
+    this.universal.addLinkedTrackerDomain(trackerId, name, domain);
+  };
+
   GOVUK.Tracker = Tracker;
 })();

data/app/assets/spec/unit/analytics/TrackerSpec.js

@@ -71,4 +71,25 @@ describe("GOVUK.Tracker", function() {
     });
   });
 
+  describe('when adding a linked domain', function() {
+    beforeEach(function() {
+      tracker = new GOVUK.Tracker(this.config);
+    });
+
+    it('adds a linked domain to universal only', function() {
+      window._gaq = [];
+      tracker.addLinkedTrackerDomain('1234', 'test', 'www.example.com');
+
+      expect(window._gaq).toEqual([]);
+      var allArgs = window.ga.calls.allArgs()
+      expect(allArgs).toContain(['create', '1234', 'auto', {'name': 'test'}]);
+      expect(allArgs).toContain(['require', 'linker']);
+      expect(allArgs).toContain(['test.require', 'linker']);
+      expect(allArgs).toContain(['linker:autoLink', ['www.example.com']]);
+      expect(allArgs).toContain(['test.linker:autoLink', ['www.example.com']]);
+      expect(allArgs).toContain(['test.set', 'anonymizeIp', true]);
+      expect(allArgs).toContain(['test.send', 'pageview']);
+    });
+  });
+
 });

data/app/assets/stylesheets/_colours.scss

@@ -103,8 +103,10 @@ $panel-colour: $grey-3;           // Related links panel, page footer etc.
 $canvas-colour: $grey-4;          // Page background
 $highlight-colour: $grey-4;       // Table stripes etc.
 $page-colour: $white;             // The page
+$discovery-colour: $fuschia;      // Discovery badges and banners
 $alpha-colour: $pink;             // Alpha badges and banners
 $beta-colour: $orange;            // Beta badges and banners
+$live-colour: $grass-green;       // Live badges and banners
 $banner-text-colour: #000;        // Text colour for Alpha & Beta banners
 $error-colour: #af1324;           // Error text and border colour
 $error-background: #fef7f7;       // Error background colour

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -288,7 +288,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4030544481151529176
+      hash: -3226103132821622177
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -297,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4030544481151529176
+      hash: -3226103132821622177
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23