govuk_frontend_toolkit 7.4.0 → 7.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7d913fed9e8375459ac2c0cb48ba26fd4bea526a38faa372ca84cbcb0333e2b
-  data.tar.gz: 87d5bacfb307d6586cb334764aa31e5165a4720320374905023498c273ed95a8
+  metadata.gz: b4913494b0cdbf61aa9299eeeadd59554fd0bfe9405e2d289843b13bc449c439
+  data.tar.gz: c789e4465c0602474c0cde4b0feef7c18e14023d76302b448d3e88bfff0b1537
 SHA512:
-  metadata.gz: fb987f4d033bd8089be306d3301fb5f93c07ff0fbcc52f5d5938b006413312184d31893fb48869e9d4fcd324a21de6358830f8fa4112f21c5d548a7a848b6af7
-  data.tar.gz: 0340fecd6ab4340d6fdfb47dd7ed6d76b867ab45cd39bd6c5846330a1836c0b414f8f981af5bc0bdeb73da8f93b2cb04c91e02b4a94fb12f3b51a684fed50688
+  metadata.gz: 9793ecdbe64c510c30aeae0e123ce16504e0db23bf2abf98bf03b9c20723267ffaacc965e5bc2a87205c49f08945814602598bce20f6ec66b0f391e4c9d47456
+  data.tar.gz: 3ce3e412d2f429c43cea5bb7636f624b87ce322cd81cd46990d1381ff9fb6fec59a71578063c56e35215c15a1194b4725398e4ff0416dd589aaa762c23381fd7

data/.travis.yml

@@ -4,7 +4,7 @@ branches:
   only:
     - master
 before_install:
-  - openssl aes-256-cbc -K $encrypted_839034082a06_key -iv $encrypted_839034082a06_iv -in .travis/govuk_frontend_toolkit_gem_push.enc -out ~/.ssh/id_rsa -d
+  - openssl aes-256-cbc -K $encrypted_1c9807165ece_key -iv $encrypted_1c9807165ece_iv -in .travis/govuk_frontend_toolkit_gem_push.enc -out ~/.ssh/id_rsa -d
   - chmod 600 ~/.ssh/id_rsa
   - git config --global user.name "GOV.UK Design System CI"
   - git config --global user.email "design-system-pipeline@digital.cabinet-office.gov.uk"

data/.travis/govuk_frontend_toolkit_gem_push.pub

@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDnLVT7VFnEOSh/6MPQrWn8YHsjts6J+EZndbcbliwCjVhjCRbATTlS+wtR+6do279dVQRWXxaS4dNgIuwhvgBTD9YpMTSn0WsHWaEWIFJ6brx+lhXy9CPkuCAg8hwpMyQWSxmv9yAS+vw27REL68yq2hwWt+morpghGRhokJYz/ietyZssgHTOTE6i2WiArDjz4xarWrRE1Aht/sFMQeoMRLdIDj1FdmWHTQo9yZy1ZmhgpM2MMwSoNyKn+vTqJjJmRy8yA5sBdlaViKx1G9RSFNId/SLVQLb8zCFzyySs6V/fL1YpxNDZfAtmhxMbxdPkKIMkplf+7VS4Oz68Qdpu6lusehWFOVArthb4e876FKoxVAKmH429ybRXEsZDMFPtA4LEwFcpKNUUgHLkQRKQaGEmTcC5z8UlFIqOU8NDpjWfATUKnnoxYo1nz5Nr8nWpgVW/0o7rYzPgplQQMiWmukG+RNELcaoeZSExWpRye/BP0UKQ7IA9qzD1C55/ehCxcAfSzdiSJ0BwxbZ9YRJUgYHjNCj/6WKvZo/PzSTtdxKwvVh8dGUMNUDwYHEfrAxJBOeWi7Te+CFh6xg/yS8P8JP3zRpQrz9qJ0ZwwjImnR500KSvBzww1gLMTjqBpY3SbKtSIcSrtwCQUMIkctfbj4WjyAf7BpD2g6PJ5LRrhQ== govuk_frontend_toolkit_gem_push
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+j/U0WFz2gqGhaj8Xriug1UwSicikVGQev+0aBVkYy/V67eQhg+lQJbMunsqY47yPT8TkevXZIaTqRTs/39lh9z97CMBEK8+n5qATODEGxLG/hLopzvHe221EryNJRWS7J3oGnpjPJfEh+DAYOewqkHFLqFspKSI4KZK4cpT+xMEyTRtjeGFQIO+2I3T5lC3xUNeH4nNb4V3K8h1x1zhNsYKxZq0qPtBh01z6ny5Fv0M0zNGGk44o/1kN8eozdEAgQrKORtgWX7BGM+qyrztW74fUetbRF9FLyEhdDdmLQe3CRKhYVFUobGXgRzDYy6zuYWjvy/oG8et/BIU7AUHFtihlorAvLpRVuRaFxgzQ1ZxwWA9Kp7QUer1fN5BfW7iVt5HbsUrnzsDXr1dPXRWu1QiKphJbJp9j08NqXnkrVs6QyyzNgkYKYNRsYHyOAuXrp3I2lDtW2nH+fkgOn5fMp5LU6EoiR1rtx+S9uEKf8UOrfZoM51jo3ZjxJt22zZf0fUFxoeuw5JyLgKMsnLM67a7Cd+DAQmDUlyoJf+u2JtrhDF65OpmQreWMpeClfOPZc2aF1Dv4atgdAZzAl/GpzdjtihkdK0XOlCuQ7/onXl8eyJ4Dlrsz6zvG6ehN7QPvr2vgdvbNWF8RPCJcajxxW9vGMiKxC4RKJvpOlSOXrw== design-system-pipeline@digital.cabinet-office.gov.uk

data/app/assets/.travis/govuk_frontend_toolkit_push.pub

@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC4O7e+NxLRfS348oGhyCeKrosyqN8Hd6MUD1JMePx0zU21h3fPWWI1Y6/ZW9FeDZ9XhSLD46iZsIU3GckEp1pZJONxOVnpv/I6DKUcfBe54RGTYg7S9Kooso55zKOVjknfnNmAQC9IpPwpBoXR2niXWN8wvxL7UPgrWrdwpnHgg+Kdr8RZ6Bk52jLm2O+AE4Q7nqu6k7qd0t78e5/aGa4+eWWcWqYy1vxv8NRoulg5/SAjhBV0Qq5Sbq/PHTgU0MgYAjnT60TToEkP4t/XSq02BUURznEHbNTI1drQZTpsB2eUK8Uf8+Leo5f2gmcwfO1Eif5B0rSR2tCebo5sETuqoZQ3EoAL100/y4f+IFyGEwnm4oVq4q8YNpmd5+aZvqYC87m1Hkro+ifQjFaMtB0XHCrV5S2RZwuP2Xc1I7NaV0ene1F2kSEhsUlZPwP/NYaXov4KLVdybgcg7LkA9zTEcEujR9rfIrzmXY6IGP0cAq+f+GhmdpoimUnBqIdtv8ZGTZ+FZP9ufNEdpKUhXGQ3Mmf9IdFPnwJ1r/MtfbZKRyGVrUufKPH2LLfR2HQZy9jZ6Y50TrSDePaO4G4bn6XzbvPW8VcozGxFB323/VY8+8c5sKnFCONKIzTfCCd+KcD8wNhBP8NQ1w7ci6Mm5BYZcO8BVVK7SrjPvY5UsobFdw== govuk_frontend_toolkit_push
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDGga8p2/rZkT25sI12Jhc7QWVkHi5FAuAaCRcKadtnlCCvILeakCrQJtVmiRSSI+U2t1HYjE+EDyE5SaGGaDwPQwCJs5K6Z+du2lTNrLestGeC2XnXPFHTNTN17ddRVnt5UCjL6w+1USYXnZ2a1mJO/M/CO5Z3uXYRXFiKWhQ5/YrfzhTs7wZPILCMR/VbOiH8WGrqM77sX/6FVkDtNjIN9PqwUAtHlEiFEpXTxlNg7E/xU1lOxIFvrNtaM9Glhgq1gekvr0OQVTk8WvxVtYpD/BmUm9nXnFkIZamE81dPcqSm3/9xheQz2HmUK18zZip6L2XIR2bj3KfA/uku1+G3ve7Llx54/99RYxZrPVszqhv23nXFqCf7/5yyXIKlXefKX+qBw1yAYkI/anL7vkDaAL89CTzNd+AXlgyC114eHAbpo+rd9Vib+n3aoZrovsBgvJwUXIW5RgqxL9QJfqycOz6OD2uetfOLpgtIaKNtca6/YiGZGO4t8eRqVzg8zVfaDjH+n+BZhKuGop5ioJ7W7iGjE+FqQZu8KoQDiDs3N0VLkXLJfkFfwTr1GvmFj3rk2NN1voUXxoHiqQFdhL2Szkko4SyrATdAAumOCixKoCJGfh2IkCJ3Oo+y/wBVMH/V6KKADejku27NlfRfo3jnA851Qfq4ArAID7ECC0/cnw== design-system-pipeline@digital.cabinet-office.gov.uk

data/app/assets/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 7.4.1
+
+- Use a path, not a full url, as the `defaultPathForTrackPageview` because our analytics trackers expect the explicit page param to be a path, not a url ([PR #451](https://github.com/alphagov/govuk_frontend_toolkit/pull/451)).  Analytics sent with 7.3.0 and 7.4.0 are broken without this fix.
+
 # 7.4.0
 
 - Allow wrapping arguments to analytics as PII safe to tell the analytics code not to attempt to strip PII from the values: ([PR #448](https://github.com/alphagov/govuk_frontend_toolkit/pull/448))

data/app/assets/VERSION.txt

@@ -1 +1 @@
-7.4.0
+7.4.1

data/app/assets/create-release.sh

@@ -10,7 +10,7 @@ git config --global user.email "design-system-pipeline@digital.cabinet-office.go
 git remote add origin_ssh git@github.com:$REPO_PATH.git
 
 # This openssl command was generated automatically by `travis encrypt-file`, see `.travis/README.md` for more details
-openssl aes-256-cbc -K $encrypted_909ac1036a94_key -iv $encrypted_909ac1036a94_iv -in .travis/govuk_frontend_toolkit_push.enc -out ~/.ssh/id_rsa -d
+openssl aes-256-cbc -K $encrypted_53be47f46000_key -iv $encrypted_53be47f46000_iv -in .travis/govuk_frontend_toolkit_push.enc -out ~/.ssh/id_rsa -d
 chmod 600 ~/.ssh/id_rsa
 
 echo "Check to see if the version file has been updated"

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

@@ -93,17 +93,17 @@
     GOVUK.GOVUKTracker.load()
   }
 
-  Analytics.prototype.defaultPathForTrackPageview = function () {
-    // Ignore anchor, but keep query string as per default behaviour of
-    // GA (see: https://developers.google.com/analytics/devguides/collection/analyticsjs/pages#overview)
+  Analytics.prototype.defaultPathForTrackPageview = function (location) {
+    // Get the page path including querystring, but ignoring the anchor
+    // as per default behaviour of GA (see: https://developers.google.com/analytics/devguides/collection/analyticsjs/pages#overview)
     // we ignore the possibility of there being campaign variables in the
     // anchor because we wouldn't know how to detect and parse them if they
     // were present
-    return this.stripPIIFromString(window.location.href.split('#')[0])
+    return this.stripPIIFromString(location.href.substring(location.origin.length).split('#')[0])
   }
 
   Analytics.prototype.trackPageview = function (path, title, options) {
-    arguments[0] = arguments[0] || this.defaultPathForTrackPageview()
+    arguments[0] = arguments[0] || this.defaultPathForTrackPageview(window.location)
     if (arguments.length === 0) { arguments.length = 1 }
     this.sendToTrackers('trackPageview', this.stripPII(arguments))
   }

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

@@ -49,25 +49,53 @@ describe('GOVUK.Analytics', function () {
     })
   })
 
+  describe('extracting the default path for a page view', function () {
+    it('returns a path extracted from the location', function () {
+      var location = {
+        href: 'https://govuk-frontend-toolkit.example.com/a/path',
+        origin: 'https://govuk-frontend-toolkit.example.com'
+      }
+      expect(analytics.defaultPathForTrackPageview(location)).toEqual('/a/path')
+    })
+
+    it('includes the querystring in the path extracted from the location', function () {
+      var location = {
+        href: 'https://govuk-frontend-toolkit.example.com/a/path?with=a&query=string',
+        origin: 'https://govuk-frontend-toolkit.example.com'
+      }
+      expect(analytics.defaultPathForTrackPageview(location)).toEqual('/a/path?with=a&query=string')
+    })
+
+    it('removes any anchor from the path extracted from the location', function () {
+      var location = {
+        href: 'https://govuk-frontend-toolkit.example.com/a/path#with-an-anchor',
+        origin: 'https://govuk-frontend-toolkit.example.com'
+      }
+      expect(analytics.defaultPathForTrackPageview(location)).toEqual('/a/path')
+      location.href = 'https://govuk-frontend-toolkit.example.com/a/path?with=a&query=string#with-an-anchor'
+      expect(analytics.defaultPathForTrackPageview(location)).toEqual('/a/path?with=a&query=string')
+    })
+  })
+
   describe('tracking pageviews', function () {
     beforeEach(function () {
-      spyOn(analytics, 'defaultPathForTrackPageview').and.returnValue('https://govuk-frontend-toolkit.example.com/a/page?with=a&query=string')
+      spyOn(analytics, 'defaultPathForTrackPageview').and.returnValue('/a/page?with=a&query=string')
     })
 
     it('injects a default path if no args are supplied', function () {
       analytics.trackPageview()
       console.log(window.ga.calls.mostRecent().args)
-      expect(window.ga.calls.mostRecent().args[2].page).toEqual('https://govuk-frontend-toolkit.example.com/a/page?with=a&query=string')
+      expect(window.ga.calls.mostRecent().args[2].page).toEqual('/a/page?with=a&query=string')
     })
 
     it('injects a default path if args are supplied, but the path arg is blank', function () {
       analytics.trackPageview(null)
       console.log(window.ga.calls.mostRecent().args)
-      expect(window.ga.calls.mostRecent().args[2].page).toEqual('https://govuk-frontend-toolkit.example.com/a/page?with=a&query=string')
+      expect(window.ga.calls.mostRecent().args[2].page).toEqual('/a/page?with=a&query=string')
 
       analytics.trackPageview(undefined)
       console.log(window.ga.calls.mostRecent().args)
-      expect(window.ga.calls.mostRecent().args[2].page).toEqual('https://govuk-frontend-toolkit.example.com/a/page?with=a&query=string')
+      expect(window.ga.calls.mostRecent().args[2].page).toEqual('/a/page?with=a&query=string')
     })
 
     it('uses the supplied path', function () {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 7.4.1
 platform: ruby
 authors:
 - Government Digital Service