govuk_frontend_toolkit 4.2.0 → 4.2.1

data/app/assets/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.2.1
+
+- Track download links using events not pageviews
+
 # 4.2.0
 
 - Add two analytics plugins for download and external link tracking

data/app/assets/VERSION.txt

@@ -1 +1 @@
-4.2.0
+4.2.1

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

@@ -12,9 +12,14 @@
     function trackDownload(evt) {
       var $link = getLinkFromEvent(evt),
           href = $link.attr('href'),
+          evtOptions = {transport: 'beacon'},
           linkText = $.trim($link.text());
 
-      GOVUK.analytics.trackPageview(href, linkText, {transport: 'beacon'});
+      if (linkText) {
+        evtOptions.label = linkText;
+      }
+
+      GOVUK.analytics.trackEvent('Download Link Clicked', href, evtOptions);
     }
 
     function getLinkFromEvent(evt) {

data/app/assets/jenkins.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
 
+bundle install
 npm install
 npm test
 
@@ -12,7 +13,7 @@ MASTER_SHA=`git rev-parse origin/master`
 HEAD_SHA=`git rev-parse HEAD`
 if [ "$MASTER_SHA" == "$HEAD_SHA" ]; then
   # get the version from the version file
-  VERSION_TAG="v`cat VERSION.TXT`"
+  VERSION_TAG="v`cat VERSION.txt`"
 
   # check to make sure the tag doesn't already exist
   if ! git rev-parse $VERSION_TAG >/dev/null 2>&1; then

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

@@ -16,7 +16,7 @@ describe("GOVUK.analyticsPlugins.downloadLinkTracker", function() {
 
     $('html').on('click', function(evt) { evt.preventDefault(); });
     $('body').append($links);
-    GOVUK.analytics = {trackPageview:function(){}};
+    GOVUK.analytics = {trackEvent:function(){}};
     GOVUK.analyticsPlugins.downloadLinkTracker({selector: 'a[href$=".pdf"], a[href$=".xslt"], a[href$=".doc"], a[href$=".png"]'});
   });
 
@@ -28,34 +28,37 @@ describe("GOVUK.analyticsPlugins.downloadLinkTracker", function() {
   });
 
   it('listens to clicks on links that match the selector', function() {
-    spyOn(GOVUK.analytics, 'trackPageview');
+    spyOn(GOVUK.analytics, 'trackEvent');
 
     $('.download-links a').each(function() {
       $(this).trigger('click');
-      expect(GOVUK.analytics.trackPageview).toHaveBeenCalled();
-      GOVUK.analytics.trackPageview.calls.reset();
+      expect(GOVUK.analytics.trackEvent).toHaveBeenCalled();
+      GOVUK.analytics.trackEvent.calls.reset();
     });
 
     $('.normal-links a').each(function() {
       $(this).trigger('click');
-      expect(GOVUK.analytics.trackPageview).not.toHaveBeenCalled();
-      GOVUK.analytics.trackPageview.calls.reset();
+      expect(GOVUK.analytics.trackEvent).not.toHaveBeenCalled();
+      GOVUK.analytics.trackEvent.calls.reset();
     });
   });
 
   it('listens to click events on elements within download links', function() {
-    spyOn(GOVUK.analytics, 'trackPageview');
+    spyOn(GOVUK.analytics, 'trackEvent');
 
     $('.download-links a img').trigger('click');
-    expect(GOVUK.analytics.trackPageview).toHaveBeenCalledWith('/an/image/link.png', '', {transport: 'beacon'});
+    expect(GOVUK.analytics.trackEvent).toHaveBeenCalledWith('Download Link Clicked', '/an/image/link.png', {transport: 'beacon'});
   });
 
-  it('tracks a download link as a pageview with a custom title', function() {
-    spyOn(GOVUK.analytics, 'trackPageview');
+  it('tracks a download link as an event with link text as the label', function() {
+    spyOn(GOVUK.analytics, 'trackEvent');
     $('.download-links a').trigger('click');
 
-    expect(GOVUK.analytics.trackPageview).toHaveBeenCalledWith('/one.pdf', 'PDF', {transport: 'beacon'});
-    expect(GOVUK.analytics.trackPageview).toHaveBeenCalledWith('/two.xslt', 'Spreadsheet', {transport: 'beacon'});
-    expect(GOVUK.analytics.trackPageview).toHaveBeenCalledWith('/something/uploads/system/three.doc', 'Document', {transport: 'beacon'});
+    expect(GOVUK.analytics.trackEvent).toHaveBeenCalledWith(
+      'Download Link Clicked', '/one.pdf', {label: 'PDF', transport: 'beacon'});
+    expect(GOVUK.analytics.trackEvent).toHaveBeenCalledWith(
+      'Download Link Clicked', '/two.xslt', {label: 'Spreadsheet', transport: 'beacon'});
+    expect(GOVUK.analytics.trackEvent).toHaveBeenCalledWith(
+      'Download Link Clicked', '/something/uploads/system/three.doc', {label: 'Document', transport: 'beacon'});
   });
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -290,7 +290,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 793058166375182819
+      hash: 1621947879198533180
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -299,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 793058166375182819
+      hash: 1621947879198533180
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23