govuk_frontend_toolkit 4.13.0 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdab1cc5481c808d894dabec2ec8377f3f07e21b
-  data.tar.gz: ad538d6e392ef3ae4408d8df873580f938234488
+  metadata.gz: fcc2e1608a32115e7405c8579739e7673c4e12d6
+  data.tar.gz: d2a23439130453227958efe416ecda2ebf335e6c
 SHA512:
-  metadata.gz: f1fd18797d04ab572d43c1cde7fdae57ff2bc3cf4ed5aa0834ee881bfe15744d1d92222d2e08718ae3325dd9c8d987ca280b8edab770bf0debb6034b912bbf8f
-  data.tar.gz: d3bc7e3a5dbf7a5e92a42ac7b80a9c5d571c80dd3f71e215f7b429e3af509fc90982a4712aa7b206243fbcc944af7e4b928213c81cb38f002630f3920035dfab
+  metadata.gz: 4336246cb9440cd42fc7aa9d369112c6bc4f50319e43b3f5f62149e6e2ccafbf29c936b9fa32c7f28456c5549ae7d24340495fe5ed79d63937699cfa6316b027
+  data.tar.gz: 935e052dc4755027b64609e3837bd01802400f7b02ba5fcc57e00bd89f82a08d94d011471df5bc7e297baf9376f5529e6c30e792811aa897886da623c56f5370

data/app/assets/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 4.14.0
+
+- Allow use of multiple GA customDimensionIndex. See [this section](https://github.com/alphagov/govuk_frontend_toolkit/blob/master/docs/javascript.md#using-google-custom-dimensions-with-your-own-statistical-model) of the documentation for more information.
+- Configurable duration (in days) for AB Test cookie. See [this section](https://github.com/alphagov/govuk_frontend_toolkit/blob/master/docs/javascript.md#multivariate-test-framework) of the documentation for more information.
+- Allow base scripts to run within a module loader. See [this PR](https://github.com/alphagov/govuk_frontend_toolkit/pull/290) for more information.
+
 # 4.13.0
 
 - Make headings block-level by default (PR #200). If you are styling elements you want to be inline with heading includes, you’ll need to explicitly make them inline in your CSS.

data/app/assets/README.md

@@ -1,5 +1,11 @@
 # GOV.UK frontend toolkit
 
+---
+
+#### You can help us improve the GOV.UK frontend toolkit by completing our [5 minute survey](https://www.surveymonkey.co.uk/r/2MZRS9H).
+
+---
+
 A collection of Sass and JavaScript files for using as part of your
 application's frontend.
 

data/app/assets/VERSION.txt

@@ -1 +1 @@
-4.13.0
+4.14.0

data/app/assets/docs/javascript.md

@@ -178,6 +178,20 @@ var test = new GOVUK.MultivariateTest({
 });
 ```
 
+If you want to set the cookie expiration then you can optionally set cookieDuration as follows:
+
+```javascript
+var test = new GOVUK.MultivariateTest({
+  name: 'car_tax_button_text',
+  cookieDuration: 14,
+  cohorts: {
+    pay_your_car_tax: {weight: 25, callback: function() { ... }}, // 25%
+    give_us_money:    {weight: 75, callback: function() { ... }}  // 75%
+  }
+});
+```
+Here, it is set to expire in 14 days time. if this option is not set the default cookie expiration (30 days) take effect.
+
 If you have a complex test, it may be worth extending MultivariateTest with
 your own. Callbacks can be strings which will call a method of that name
 on the current object.
@@ -250,6 +264,24 @@ var test = new GOVUK.MultivariateTest({
 
 `customDimensionIndex` is the index of the custom variable in Google Analytics. GA only gives 50 integer slots to each account, and it is important that a unique integer is assigned to each test. Current contact for assigning a custom var slot for GOV.UK is: Tim Leighton-Boyce <tim.leighton-boyce@digital.cabinet-office.gov.uk>
 
+For certain types of tests where the custom dimensions in Google Analytics can only have one of three scopes (hit, session, or user). Measuring performance of A/B tests, and want to compare test results for session-scoped custom dimensions (eg: index 222) against hit-scoped ones (eg: index 223) may become important.
+
+Instead of supplying an integer (like the above example), `customDimensionIndex` can also accept an array of dimension indexes ([222, 223]), see below for more.
+
+Make sure to check GA debugger that these values are being sent before deploying.
+
+```js
+var test = new GOVUK.MultivariateTest({
+  name: 'car_tax_button_text',
+  customDimensionIndex: [222, 223],
+  cohorts: {
+    pay_your_car_tax: {weight: 25},
+    give_us_money: {weight: 50}
+  }
+});
+```
+
+
 ## Primary Links
 
 `GOVUK.PrimaryList` hides elements in a list which don't have a supplied

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

@@ -1,6 +1,7 @@
-(function() {
+(function(global) {
   "use strict";
-  window.GOVUK = window.GOVUK || {};
+
+  var GOVUK = global.GOVUK || {};
 
   // For usage and initialisation see:
   // https://github.com/alphagov/govuk_frontend_toolkit/blob/master/docs/analytics.md#create-an-analytics-tracker
@@ -61,4 +62,6 @@
   };
 
   GOVUK.Analytics = Analytics;
-})();
+
+  global.GOVUK = GOVUK;
+})(window);

data/app/assets/javascripts/govuk/analytics/download-link-tracker.js

@@ -1,5 +1,9 @@
-(function() {
+(function(global) {
   "use strict";
+
+  var $ = global.jQuery;
+  var GOVUK = global.GOVUK || {};
+
   GOVUK.analyticsPlugins = GOVUK.analyticsPlugins || {};
   GOVUK.analyticsPlugins.downloadLinkTracker = function (options) {
     var options = options || {},
@@ -32,4 +36,6 @@
       return $target;
     }
   }
-}());
+
+  global.GOVUK = GOVUK;
+})(window);

data/app/assets/javascripts/govuk/analytics/error-tracking.js

@@ -1,6 +1,9 @@
 // Extension to track errors using google analytics as a data store.
-(function() {
+(function(global) {
   "use strict";
+
+  var GOVUK = global.GOVUK || {};
+
   GOVUK.analyticsPlugins = GOVUK.analyticsPlugins || {};
 
   GOVUK.analyticsPlugins.error = function (options) {
@@ -35,12 +38,14 @@
       return false;
     }
 
-    if (window.addEventListener) {
-      window.addEventListener('error', trackJavaScriptError, false);
-    } else if (window.attachEvent) {
-      window.attachEvent('onerror', trackJavaScriptError);
+    if (global.addEventListener) {
+      global.addEventListener('error', trackJavaScriptError, false);
+    } else if (global.attachEvent) {
+      global.attachEvent('onerror', trackJavaScriptError);
     } else {
-      window.onerror = trackJavaScriptError;
+      global.onerror = trackJavaScriptError;
     }
   }
-}());
+
+  global.GOVUK = GOVUK;
+})(window);

data/app/assets/javascripts/govuk/analytics/external-link-tracker.js

@@ -1,5 +1,9 @@
-(function() {
+(function(global) {
   "use strict";
+
+  var $ = global.jQuery;
+  var GOVUK = global.GOVUK || {};
+
   GOVUK.analyticsPlugins = GOVUK.analyticsPlugins || {};
   GOVUK.analyticsPlugins.externalLinkTracker = function () {
 
@@ -33,6 +37,8 @@
   }
 
   GOVUK.analyticsPlugins.externalLinkTracker.getHostname = function() {
-    return window.location.hostname;
+    return global.location.hostname;
   }
-}());
+
+  global.GOVUK = GOVUK;
+})(window);

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

@@ -1,6 +1,7 @@
-(function() {
+(function(global) {
   "use strict";
-  window.GOVUK = window.GOVUK || {};
+
+  var GOVUK = global.GOVUK || {};
 
   var GoogleAnalyticsUniversalTracker = function(id, cookieDomain) {
     configureProfile(id, cookieDomain);
@@ -20,7 +21,7 @@
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
         (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
                              m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    })(global,document,'script','//www.google-analytics.com/analytics.js','ga');
   };
 
   // https://developers.google.com/analytics/devguides/collection/analyticsjs/pages
@@ -140,10 +141,12 @@
   };
 
   function sendToGa() {
-    if (typeof window.ga === "function") {
-      ga.apply(window, arguments);
+    if (typeof global.ga === "function") {
+      ga.apply(global, arguments);
     }
   }
 
   GOVUK.GoogleAnalyticsUniversalTracker = GoogleAnalyticsUniversalTracker;
-})();
+
+  global.GOVUK = GOVUK;
+})(window);

data/app/assets/javascripts/govuk/analytics/mailto-link-tracker.js

@@ -1,5 +1,9 @@
-(function() {
+(function(global) {
   "use strict";
+
+  var $ = global.jQuery;
+  var GOVUK = global.GOVUK || {};
+
   GOVUK.analyticsPlugins = GOVUK.analyticsPlugins || {};
   GOVUK.analyticsPlugins.mailtoLinkTracker = function () {
 
@@ -30,4 +34,6 @@
       return $target;
     }
   }
-}());
+
+  global.GOVUK = GOVUK;
+})(window);

data/app/assets/javascripts/govuk/analytics/print-intent.js

@@ -1,7 +1,9 @@
 // Extension to monitor attempts to print pages.
-(function () {
+(function (global) {
   "use strict";
 
+  var GOVUK = global.GOVUK || {};
+
   GOVUK.analyticsPlugins = GOVUK.analyticsPlugins || {};
 
   GOVUK.analyticsPlugins.printIntent = function () {
@@ -11,15 +13,15 @@
     });
 
     // Most browsers
-    if (window.matchMedia) {
-      var mediaQueryList = window.matchMedia('print'),
+    if (global.matchMedia) {
+      var mediaQueryList = global.matchMedia('print'),
         mqlListenerCount = 0;
       mediaQueryList.addListener(function (mql) {
         if (!mql.matches && mqlListenerCount === 0) {
           printAttempt();
           mqlListenerCount++;
           // If we try and print again within 3 seconds, don't log it
-          window.setTimeout(function () {
+          setTimeout(function () {
             mqlListenerCount = 0;
             // printing will be tracked again now
           }, 3000);
@@ -28,10 +30,11 @@
     }
 
     // IE < 10
-    if (window.onafterprint) {
-      window.onafterprint = printAttempt;
+    if (global.onafterprint) {
+      global.onafterprint = printAttempt;
     }
 
   };
 
-}());
+  global.GOVUK = GOVUK;
+})(window);

data/app/assets/javascripts/govuk/modules/auto-track-event.js

@@ -1,7 +1,10 @@
-(function(Modules) {
+(function(global) {
   "use strict";
 
-  Modules.AutoTrackEvent = function() {
+  var GOVUK = global.GOVUK || {};
+  GOVUK.Modules = GOVUK.Modules || {};
+
+  GOVUK.Modules.AutoTrackEvent = function() {
     this.start = function(element) {
       var options = {nonInteraction: 1}, // automatic events shouldn't affect bounce rate
           category = element.data('track-category'),
@@ -23,4 +26,5 @@
     }
   };
 
-})(window.GOVUK.Modules);
+  global.GOVUK = GOVUK;
+})(window);

data/app/assets/javascripts/govuk/modules.js

@@ -1,6 +1,8 @@
-(function($, root) {
+(function(global) {
   "use strict";
-  root.GOVUK = root.GOVUK || {};
+
+  var $ = global.jQuery;
+  var GOVUK = global.GOVUK || {};
   GOVUK.Modules = GOVUK.Modules || {};
 
   GOVUK.modules = {
@@ -53,4 +55,6 @@
       }
     }
   }
-})(jQuery, window);
+
+  global.GOVUK = GOVUK;
+})(window);

data/app/assets/javascripts/govuk/multivariate-test.js

@@ -1,7 +1,8 @@
-(function() {
+(function(global) {
   "use strict";
-  window.GOVUK = window.GOVUK || {};
-  var $ = window.$;
+
+  var $ = global.jQuery;
+  var GOVUK = global.GOVUK || {};
 
   // A multivariate test framework
   //
@@ -17,6 +18,7 @@
     this._loadOption(options, 'runImmediately', true);
     this._loadOption(options, 'defaultWeight', 1);
     this._loadOption(options, 'contentExperimentId', null);
+    this._loadOption(options, 'cookieDuration', 30);
 
     if (this.runImmediately) {
       this.run();
@@ -68,20 +70,29 @@
     var cohort = GOVUK.cookie(this.cookieName());
     if (!cohort || !this.cohorts[cohort]) {
       cohort = this.chooseRandomCohort();
-      GOVUK.cookie(this.cookieName(), cohort, {days: 30});
+      GOVUK.cookie(this.cookieName(), cohort, {days: this.cookieDuration});
     }
     return cohort;
   };
 
   MultivariateTest.prototype.setCustomVar = function(cohort) {
-    if (this.customDimensionIndex) {
-      GOVUK.analytics.setDimension(
-        this.customDimensionIndex,
-        this.cookieName() + "__" + cohort
-      );
+    if (this.customDimensionIndex &&
+      this.customDimensionIndex.constructor === Array) {
+      for (var index = 0; index < this.customDimensionIndex.length; index++) {
+        this.setDimension(cohort, this.customDimensionIndex[index])
+      }
+    } else if (this.customDimensionIndex) {
+      this.setDimension(cohort, this.customDimensionIndex)
     }
   };
 
+  MultivariateTest.prototype.setDimension = function(cohort, dimension) {
+    GOVUK.analytics.setDimension(
+      dimension,
+      this.cookieName() + "__" + cohort
+    );
+  };
+
   MultivariateTest.prototype.setUpContentExperiment = function(cohort) {
     var contentExperimentId = this.contentExperimentId;
     var cohortVariantId = this.cohorts[cohort]['variantId'];
@@ -130,5 +141,7 @@
     return "multivariatetest_cohort_" + this.name;
   };
 
-  window.GOVUK.MultivariateTest = MultivariateTest;
-}());
+  GOVUK.MultivariateTest = MultivariateTest;
+
+  global.GOVUK = GOVUK;
+})(window);

data/app/assets/javascripts/govuk/primary-links.js

@@ -1,6 +1,8 @@
-(function() {
+(function(global) {
   "use strict";
-  window.GOVUK = window.GOVUK || {};
+
+  var $ = global.jQuery;
+  var GOVUK = global.GOVUK || {};
 
   // Only show the first {n} items in a list, documentation is in the README.md
   var PrimaryList = function(el, selector){
@@ -39,6 +41,7 @@
       $(window).trigger('govuk.pageSizeChanged');
     }
   };
+
   GOVUK.PrimaryList = PrimaryList;
 
   GOVUK.primaryLinks = {
@@ -48,4 +51,6 @@
       });
     }
   };
-}());
+
+  global.GOVUK = GOVUK;
+})(window);

data/app/assets/javascripts/govuk/selection-buttons.js

@@ -1,9 +1,8 @@
-(function () {
+(function (global) {
   "use strict";
-  var root = this,
-      $ = root.jQuery;
 
-  if (typeof GOVUK === 'undefined') { root.GOVUK = {}; }
+  var $ = global.jQuery;
+  var GOVUK = global.GOVUK || {};
 
   var SelectionButtons = function (elmsOrSelector, opts) {
     var $elms;
@@ -107,5 +106,6 @@
     }
   };
 
-  root.GOVUK.SelectionButtons = SelectionButtons;
-}).call(this);
+  GOVUK.SelectionButtons = SelectionButtons;
+  global.GOVUK = GOVUK;
+})(window);

data/app/assets/javascripts/govuk/stick-at-top-when-scrolling.js

@@ -1,8 +1,8 @@
-(function () {
+(function (global) {
   "use strict";
-  var root = this,
-      $ = root.jQuery;
-  if(typeof root.GOVUK === 'undefined') { root.GOVUK = {}; }
+
+  var $ = global.jQuery;
+  var GOVUK = global.GOVUK || {};
 
   // Stick elements to top of screen when you scroll past, documentation is in the README.md
   var sticky = {
@@ -16,22 +16,22 @@
         sticky.$els = $els;
 
         if(sticky._scrollTimeout === false) {
-          $(root).scroll(sticky.onScroll);
-          sticky._scrollTimeout = root.setInterval(sticky.checkScroll, 50);
+          $(global).scroll(sticky.onScroll);
+          sticky._scrollTimeout = global.setInterval(sticky.checkScroll, 50);
         }
-        $(root).resize(sticky.onResize);
+        $(global).resize(sticky.onResize);
       }
-      if(root.GOVUK.stopScrollingAtFooter){
+      if(GOVUK.stopScrollingAtFooter){
         $els.each(function(i,el){
           var $img = $(el).find('img');
           if($img.length > 0){
             var image = new Image();
             image.onload = function(){
-              root.GOVUK.stopScrollingAtFooter.addEl($(el), $(el).outerHeight());
+              GOVUK.stopScrollingAtFooter.addEl($(el), $(el).outerHeight());
             };
             image.src = $img.attr('src');
           } else {
-            root.GOVUK.stopScrollingAtFooter.addEl($(el), $(el).outerHeight());
+            GOVUK.stopScrollingAtFooter.addEl($(el), $(el).outerHeight());
           }
         });
       }
@@ -43,14 +43,14 @@
       if(sticky._hasScrolled === true){
         sticky._hasScrolled = false;
 
-        var windowVerticalPosition = $(root).scrollTop();
+        var windowVerticalPosition = $(global).scrollTop();
         sticky.$els.each(function(i, el){
           var $el = $(el),
               scrolledFrom = $el.data('scrolled-from');
 
           if (scrolledFrom && windowVerticalPosition < scrolledFrom){
             sticky.release($el);
-          } else if($(root).width() > 768 && windowVerticalPosition >= $el.offset().top) {
+          } else if($(global).width() > 768 && windowVerticalPosition >= $el.offset().top) {
             sticky.stick($el);
           }
         });
@@ -72,5 +72,6 @@
       }
     }
   };
-  root.GOVUK.stickAtTopWhenScrolling = sticky;
-}).call(this);
+  GOVUK.stickAtTopWhenScrolling = sticky;
+  global.GOVUK = GOVUK;
+})(window);

data/app/assets/javascripts/govuk/stop-scrolling-at-footer.js

@@ -11,11 +11,11 @@
 // itself.
 
 
-(function () {
+(function (global) {
   "use strict";
-  var root = this,
-      $ = root.jQuery;
-  if(typeof root.GOVUK === 'undefined') { root.GOVUK = {}; }
+
+  var $ = global.jQuery;
+  var GOVUK = global.GOVUK || {};
 
   var stopScrollingAtFooter = {
     _pollingId: null,
@@ -32,7 +32,7 @@
       fixedOffset = isNaN(fixedOffset) ? 0 : fixedOffset;
 
       stopScrollingAtFooter.updateFooterTop();
-      $(root).on('govuk.pageSizeChanged', stopScrollingAtFooter.updateFooterTop);
+      $(global).on('govuk.pageSizeChanged', stopScrollingAtFooter.updateFooterTop);
 
       var $siblingEl = $('<div></div>');
       $siblingEl.insertBefore($fixedEl);
@@ -63,7 +63,7 @@
       }
     },
     onScroll: function(){
-      if (stopScrollingAtFooter._isPolling === false) { 
+      if (stopScrollingAtFooter._isPolling === false) {
         stopScrollingAtFooter.startPolling();
       }
     },
@@ -132,7 +132,9 @@
     }
   };
 
-  root.GOVUK.stopScrollingAtFooter = stopScrollingAtFooter;
+  GOVUK.stopScrollingAtFooter = stopScrollingAtFooter;
+
+  $(global).load(function(){ $(global).trigger('govuk.pageSizeChanged'); });
 
-  $(root).load(function(){ $(root).trigger('govuk.pageSizeChanged'); });
-}).call(this);
+  global.GOVUK = GOVUK;
+})(window);

data/app/assets/javascripts/stageprompt.js

@@ -1,63 +1,70 @@
 // Stageprompt 2.0.1
-// 
+//
 // See: https://github.com/alphagov/stageprompt
-// 
-// Stageprompt allows user journeys to be described and instrumented 
+//
+// Stageprompt allows user journeys to be described and instrumented
 // using data attributes.
-// 
+//
 // Setup (run this on document ready):
-// 
+//
 //   GOVUK.performance.stageprompt.setupForGoogleAnalytics();
-// 
+//
 // Usage:
-// 
+//
 //   Sending events on page load:
-// 
+//
 //     <div id="wrapper" class="service" data-journey="pay-register-birth-abroad:start">
 //         [...]
 //     </div>
-//     
+//
 //   Sending events on click:
-//   
+//
 //     <a class="help-button" href="#" data-journey-click="stage:help:info">See more info...</a>
 
-var GOVUK = GOVUK || {};
+(function(global) {
+  "use strict";
 
-GOVUK.performance = GOVUK.performance || {};
+  var $ = global.jQuery;
+  var GOVUK = global.GOVUK || {};
 
-GOVUK.performance.stageprompt = (function () {
+  GOVUK.performance = GOVUK.performance || {};
 
-  var setup, setupForGoogleAnalytics, splitAction;
+  GOVUK.performance.stageprompt = (function () {
 
-  splitAction = function (action) {
-    var parts = action.split(':');
-    if (parts.length <= 3) return parts;
-    return [parts.shift(), parts.shift(), parts.join(':')];
-  };
+    var setup, setupForGoogleAnalytics, splitAction;
 
-  setup = function (analyticsCallback) {
-    var journeyStage = $('[data-journey]').attr('data-journey'),
-        journeyHelpers = $('[data-journey-click]');
-
-    if (journeyStage) {
-      analyticsCallback.apply(null, splitAction(journeyStage));
-    }
-    
-    journeyHelpers.on('click', function (event) {
-      analyticsCallback.apply(null, splitAction($(this).data('journey-click')));
-    });
-  };
-  
-  setupForGoogleAnalytics = function () {
-    setup(GOVUK.performance.sendGoogleAnalyticsEvent);
-  };
+    splitAction = function (action) {
+      var parts = action.split(':');
+      if (parts.length <= 3) return parts;
+      return [parts.shift(), parts.shift(), parts.join(':')];
+    };
+
+    setup = function (analyticsCallback) {
+      var journeyStage = $('[data-journey]').attr('data-journey'),
+          journeyHelpers = $('[data-journey-click]');
+
+      if (journeyStage) {
+        analyticsCallback.apply(null, splitAction(journeyStage));
+      }
+
+      journeyHelpers.on('click', function (event) {
+        analyticsCallback.apply(null, splitAction($(this).data('journey-click')));
+      });
+    };
+
+    setupForGoogleAnalytics = function () {
+      setup(GOVUK.performance.sendGoogleAnalyticsEvent);
+    };
+
+    return {
+      setup: setup,
+      setupForGoogleAnalytics: setupForGoogleAnalytics
+    };
+  }());
 
-  return {
-    setup: setup,
-    setupForGoogleAnalytics: setupForGoogleAnalytics
+  GOVUK.performance.sendGoogleAnalyticsEvent = function (category, event, label) {
+    _gaq.push(['_trackEvent', category, event, label, undefined, true]);
   };
-}());
 
-GOVUK.performance.sendGoogleAnalyticsEvent = function (category, event, label) {
-  _gaq.push(['_trackEvent', category, event, label, undefined, true]);
-};
+  global.GOVUK = GOVUK;
+})(window);

data/app/assets/jenkins.sh

@@ -22,6 +22,6 @@ if [ "$MASTER_SHA" == "$HEAD_SHA" ]; then
     git push origin $VERSION_TAG
 
     # Alias branch for the most recently released tag, for easier diffing
-    git push origin master:latest-release
+    git push -f origin master:latest-release
   fi
 fi

data/app/assets/spec/support/load.js

@@ -1,4 +1,4 @@
-(function (root) {
+(function (global) {
   "use strict"
   var loadedScripts = 0,
       totalScripts,
@@ -44,4 +44,4 @@
     totalScripts = merge([manifest.support, manifest.test]);
     loadScript(totalScripts[idx], idx + 1);
   };
-}).call(this);
+})(window);

data/app/assets/spec/unit/multivariate-test.spec.js

@@ -63,6 +63,26 @@ describe("MultivariateTest", function() {
       );
     });
 
+    it("should be able to set multiple custom vars with the name and cohort if one is defined as an array", function() {
+      GOVUK.cookie.and.returnValue('foo');
+      var test = new GOVUK.MultivariateTest({
+        name: 'stuff',
+        cohorts: {
+          foo: {},
+          bar: {}
+        },
+        customDimensionIndex: [2,3]
+      });
+      expect(GOVUK.analytics.setDimension).toHaveBeenCalledWith(
+        2,
+        'multivariatetest_cohort_stuff__foo'
+      );
+      expect(GOVUK.analytics.setDimension).toHaveBeenCalledWith(
+        3,
+        'multivariatetest_cohort_stuff__foo'
+      );
+    });
+
     it("should trigger an event to track that the test has been run", function() {
       GOVUK.cookie.and.returnValue('foo');
       var test = new GOVUK.MultivariateTest({
@@ -124,6 +144,29 @@ describe("MultivariateTest", function() {
       expect(test.fooCallback).toHaveBeenCalled();
     });
 
+    it("should assign 30 if cookieDuration isn't defined", function() {
+      GOVUK.cookie.and.returnValue('foo');
+      var test = new GOVUK.MultivariateTest({
+        name: 'cookie_duration_test',
+        cohorts: {
+          foo: {callback: function(){}}
+        }
+      });
+      expect(test.cookieDuration).toEqual(30);
+    });
+
+    it("should assign the user's cookie duration, when cookieDuration is defined", function() {
+      GOVUK.cookie.and.returnValue('foo');
+      var test = new GOVUK.MultivariateTest({
+        name: 'cookie_duration_test',
+        cookieDuration: 14,
+        cohorts: {
+          foo: {callback: function(){}}
+        }
+      });
+      expect(test.cookieDuration).toEqual(14);
+    });
+
     it("should assign a new random cohort if the assigned cohort does not exist", function() {
       var fooSpy = jasmine.createSpy('fooSpy');
       var barSpy = jasmine.createSpy('barSpy');

data/govuk_frontend_toolkit.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name         = "govuk_frontend_toolkit"
   s.version      = GovUKFrontendToolkit.toolkit_version
   s.summary      = 'Tools for building frontend applications'
-  s.authors      = ['Bradley Wright']
-  s.email        = 'bradley.wright@digital.cabinet-office.gov.uk'
+  s.authors      = ["Government Digital Service"]
+  s.email        = ["govuk-dev@digital.cabinet-office.gov.uk"]
   s.homepage     = 'https://github.com/alphagov/govuk_frontend_toolkit'
   s.license      = 'MIT'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 4.13.0
+  version: 4.14.0
 platform: ruby
 authors:
-- Bradley Wright
+- Government Digital Service
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,7 +67,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.2.2
 description: 
-email: bradley.wright@digital.cabinet-office.gov.uk
+email:
+- govuk-dev@digital.cabinet-office.gov.uk
 executables: []
 extensions: []
 extra_rdoc_files: []