diff --git a/app/assets/javascripts/analytics/analytics.js b/app/assets/javascripts/analytics/analytics.js
new file mode 100644
index 000000000..b2d4dea09
--- /dev/null
+++ b/app/assets/javascripts/analytics/analytics.js
@@ -0,0 +1,62 @@
+(function (window) {
+ "use strict";
+
+ window.GOVUK = window.GOVUK || {};
+
+ // Stripped-down wrapper for Google Analytics, based on:
+ // https://github.com/alphagov/static/blob/master/doc/analytics.md
+ const Analytics = function (config) {
+ window.ga('create', config.trackingId, config.cookieDomain, config.name, { 'cookieExpires': config.expires * 24 * 60 * 60 });
+
+ window.ga('set', 'anonymizeIp', config.anonymizeIp);
+ window.ga('set', 'displayFeaturesTask', config.displayFeaturesTask);
+ window.ga('set', 'transport', config.transport);
+
+ };
+
+ Analytics.load = function () {
+ /* jshint ignore:start */
+ (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');
+ /* jshint ignore:end */
+
+ };
+
+ Analytics.prototype.trackPageview = function (path, title, options) {
+
+ // strip UUIDs
+ const page = (window.location.pathname + window.location.search).replace(
+ /[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}/g, '…'
+ );
+ window.ga('send', 'pageview', page);
+
+ };
+
+ // https://developers.google.com/analytics/devguides/collection/analyticsjs/events
+ Analytics.prototype.trackEvent = function (category, action, options) {
+
+ options = options || {};
+
+ var evt = {
+ eventCategory: category,
+ eventAction: action
+ };
+
+ if (options.label) {
+ evt.eventLabel = options.label;
+ delete options.label;
+ }
+
+ if (typeof options === 'object') {
+ $.extend(evt, options);
+ }
+
+ window.ga('send', 'event', evt);
+
+ };
+
+ window.GOVUK.Analytics = Analytics;
+
+})(window);
diff --git a/app/assets/javascripts/analytics/init.js b/app/assets/javascripts/analytics/init.js
new file mode 100644
index 000000000..0a8e012e6
--- /dev/null
+++ b/app/assets/javascripts/analytics/init.js
@@ -0,0 +1,41 @@
+(function (window) {
+ "use strict";
+
+ window.GOVUK = window.GOVUK || {};
+
+ const trackingId = 'UA-75215134-1';
+
+ // Disable analytics by default
+ window[`ga-disable-${trackingId}`] = true;
+
+ const initAnalytics = function () {
+
+ // guard against being called more than once
+ if (!('analytics' in window.GOVUK)) {
+
+ window[`ga-disable-${trackingId}`] = false;
+
+ // Load Google Analytics libraries
+ window.GOVUK.Analytics.load();
+
+ // Configure profiles and make interface public
+ // for custom dimensions, virtual pageviews and events
+ window.GOVUK.analytics = new GOVUK.Analytics({
+ trackingId: trackingId,
+ cookieDomain: 'auto',
+ anonymizeIp: true,
+ displayFeaturesTask: null,
+ transport: 'beacon',
+ name: 'GOVUK.analytics',
+ expires: 365
+ });
+
+ // Track initial pageview
+ window.GOVUK.analytics.trackPageview();
+
+ }
+
+ };
+
+ window.GOVUK.initAnalytics = initAnalytics;
+})(window);
diff --git a/app/assets/javascripts/consent.js b/app/assets/javascripts/consent.js
new file mode 100644
index 000000000..e5953974d
--- /dev/null
+++ b/app/assets/javascripts/consent.js
@@ -0,0 +1,15 @@
+(function (window) {
+ "use strict";
+
+ function hasConsentFor (cookieCategory) {
+ const consentCookie = window.GOVUK.getConsentCookie();
+
+ if (consentCookie === null) { return false; }
+
+ if (!(cookieCategory in consentCookie)) { return false; }
+
+ return consentCookie[cookieCategory];
+ }
+
+ window.GOVUK.hasConsentFor = hasConsentFor;
+})(window);
diff --git a/app/assets/javascripts/cookieMessage.js b/app/assets/javascripts/cookieMessage.js
index 4e17cbec7..1ad26681d 100644
--- a/app/assets/javascripts/cookieMessage.js
+++ b/app/assets/javascripts/cookieMessage.js
@@ -1,16 +1,97 @@
-(function () {
- "use strict";
+window.GOVUK = window.GOVUK || {};
+window.GOVUK.Modules = window.GOVUK.Modules || {};
- var root = this;
- if(typeof root.GOVUK === 'undefined') { root.GOVUK = {}; }
+(function (Modules) {
+ function CookieBanner () { }
- GOVUK.addCookieMessage = function () {
- var message = document.getElementById('global-cookie-message'),
- hasCookieMessage = (message && GOVUK.cookie('seen_cookie_message') === null);
+ CookieBanner.clearOldCookies = function () {
+ // clear any cookies set by the previous version
+ var oldCookies = ['seen_cookie_message', '_ga', '_gid'];
- if (hasCookieMessage) {
- message.style.display = 'block';
- GOVUK.cookie('seen_cookie_message', 'yes', { days: 28 });
+ for (var i = 0; i < oldCookies.length; i++) {
+ if (window.GOVUK.cookie(oldCookies[i])) {
+ var cookieString = oldCookies[i] + '=;expires=' + new Date() + ';domain=' + window.location.hostname.replace(/^www\./, '.') + ';path=/';
+ document.cookie = cookieString;
+ }
}
};
-}).call(this);
+
+ CookieBanner.prototype.start = function ($module) {
+ this.$module = $module[0];
+ this.$module.hideCookieMessage = this.hideCookieMessage.bind(this);
+ this.$module.showConfirmationMessage = this.showConfirmationMessage.bind(this);
+ this.$module.setCookieConsent = this.setCookieConsent.bind(this);
+
+ this.$module.cookieBanner = document.querySelector('.notify-cookie-banner');
+ this.$module.cookieBannerConfirmationMessage = this.$module.querySelector('.notify-cookie-banner__confirmation');
+
+ this.setupCookieMessage();
+ };
+
+ CookieBanner.prototype.setupCookieMessage = function () {
+ this.$hideLink = this.$module.querySelector('button[data-hide-cookie-banner]');
+ if (this.$hideLink) {
+ this.$hideLink.addEventListener('click', this.$module.hideCookieMessage);
+ }
+
+ this.$acceptCookiesLink = this.$module.querySelector('button[data-accept-cookies=true]');
+ if (this.$acceptCookiesLink) {
+ this.$acceptCookiesLink.addEventListener('click', () => this.$module.setCookieConsent(true));
+ }
+
+ this.$rejectCookiesLink = this.$module.querySelector('button[data-accept-cookies=false]');
+ if (this.$rejectCookiesLink) {
+ this.$rejectCookiesLink.addEventListener('click', () => this.$module.setCookieConsent(false));
+ }
+
+ this.showCookieMessage();
+ };
+
+ CookieBanner.prototype.showCookieMessage = function () {
+ // Show the cookie banner if not in the cookie settings page
+ if (!this.isInCookiesPage()) {
+ var hasCookiesPolicy = window.GOVUK.cookie('cookies_policy');
+
+ if (this.$module && !hasCookiesPolicy) {
+ this.$module.style.display = 'block';
+ }
+ }
+ };
+
+ CookieBanner.prototype.hideCookieMessage = function (event) {
+ if (this.$module) {
+ this.$module.style.display = 'none';
+ }
+
+ if (event.target) {
+ event.preventDefault();
+ }
+ };
+
+ CookieBanner.prototype.setCookieConsent = function (analyticsConsent) {
+ window.GOVUK.setConsentCookie({ 'analytics': analyticsConsent });
+
+ this.$module.showConfirmationMessage(analyticsConsent);
+ this.$module.cookieBannerConfirmationMessage.focus();
+
+ if (analyticsConsent) { window.GOVUK.initAnalytics(); }
+ };
+
+ CookieBanner.prototype.showConfirmationMessage = function (analyticsConsent) {
+ var messagePrefix = analyticsConsent ? 'You’ve accepted analytics cookies.' : 'You told us not to use analytics cookies.';
+
+ this.$cookieBannerMainContent = document.querySelector('.notify-cookie-banner__wrapper');
+ this.$cookieBannerConfirmationMessage = document.querySelector('.notify-cookie-banner__confirmation-message');
+
+ this.$cookieBannerConfirmationMessage.insertAdjacentText('afterbegin', messagePrefix);
+ this.$cookieBannerMainContent.style.display = 'none';
+ this.$module.cookieBannerConfirmationMessage.style.display = 'block';
+ };
+
+ CookieBanner.prototype.isInCookiesPage = function () {
+ return window.location.pathname === '/cookies';
+ };
+
+ Modules.CookieBanner = CookieBanner;
+})(window.GOVUK.Modules);
+
diff --git a/app/assets/javascripts/cookieSettings.js b/app/assets/javascripts/cookieSettings.js
new file mode 100644
index 000000000..684b70a7e
--- /dev/null
+++ b/app/assets/javascripts/cookieSettings.js
@@ -0,0 +1,84 @@
+window.GOVUK = window.GOVUK || {};
+window.GOVUK.Modules = window.GOVUK.Modules || {};
+
+(function (Modules) {
+ function CookieSettings () {}
+
+ CookieSettings.prototype.start = function ($module) {
+ this.$module = $module[0];
+
+ this.$module.submitSettingsForm = this.submitSettingsForm.bind(this);
+
+ document.querySelector('form[data-module=cookie-settings]')
+ .addEventListener('submit', this.$module.submitSettingsForm);
+
+ this.setInitialFormValues();
+ };
+
+ CookieSettings.prototype.setInitialFormValues = function () {
+ var currentConsentCookie = window.GOVUK.getConsentCookie('consent');
+
+ if (!currentConsentCookie) { return; }
+
+ var radioButton;
+
+ if (currentConsentCookie.analytics) {
+ radioButton = document.querySelector('input[name=cookies-analytics][value=on]');
+ } else {
+ radioButton = document.querySelector('input[name=cookies-analytics][value=off]');
+ }
+
+ radioButton.checked = true;
+ };
+
+ CookieSettings.prototype.submitSettingsForm = function (event) {
+ event.preventDefault();
+
+ var formInputs = event.target.querySelectorAll("input[name=cookies-analytics]");
+ var options = {};
+
+ for ( var i = 0; i < formInputs.length; i++ ) {
+ var input = formInputs[i];
+ if (input.checked) {
+ var value = input.value === "on" ? true : false;
+
+ options.analytics = value;
+ break;
+ }
+ }
+
+ window.GOVUK.setConsentCookie(options);
+
+ this.showConfirmationMessage();
+
+ if(window.GOVUK.hasConsentFor('analytics')) {
+ window.GOVUK.initAnalytics();
+ }
+
+ return false;
+ };
+
+ CookieSettings.prototype.showConfirmationMessage = function () {
+ var confirmationMessage = document.querySelector('div[data-cookie-confirmation]');
+ var previousPageLink = document.querySelector('.cookie-settings__prev-page');
+ var referrer = CookieSettings.prototype.getReferrerLink();
+
+ document.body.scrollTop = document.documentElement.scrollTop = 0;
+
+ if (referrer && referrer !== document.location.pathname) {
+ previousPageLink.href = referrer;
+ previousPageLink.style.display = "block";
+ } else {
+ previousPageLink.style.display = "none";
+ }
+
+ confirmationMessage.style.display = "block";
+ };
+
+ CookieSettings.prototype.getReferrerLink = function () {
+ return document.referrer ? new URL(document.referrer).pathname : false;
+ };
+
+ Modules.CookieSettings = CookieSettings;
+})(window.GOVUK.Modules);
+
diff --git a/app/assets/javascripts/errorTracking.js b/app/assets/javascripts/errorTracking.js
index 7cabb1a26..b0ec16f27 100644
--- a/app/assets/javascripts/errorTracking.js
+++ b/app/assets/javascripts/errorTracking.js
@@ -1,22 +1,22 @@
-(function(Modules) {
+(function(window) {
"use strict";
- Modules.TrackError = function() {
+ window.GOVUK.Modules.TrackError = function() {
this.start = function(component) {
- if (!('ga' in window)) return;
+ if (!('analytics' in window.GOVUK)) return;
- ga(
- 'send',
- 'event',
+ window.GOVUK.analytics.trackEvent(
'Error',
$(component).data('error-type'),
- $(component).data('error-label')
+ {
+ 'label': $(component).data('error-label')
+ }
);
};
};
-})(window.GOVUK.Modules);
+})(window);
diff --git a/app/assets/javascripts/govuk/cookie-functions.js b/app/assets/javascripts/govuk/cookie-functions.js
index fdabe48e3..5fa15bee7 100644
--- a/app/assets/javascripts/govuk/cookie-functions.js
+++ b/app/assets/javascripts/govuk/cookie-functions.js
@@ -1,8 +1,17 @@
-(function () {
- "use strict";
+// used by the cookie banner component
- var root = this;
- if(typeof root.GOVUK === 'undefined') { root.GOVUK = {}; }
+(function (root) {
+ 'use strict';
+ window.GOVUK = window.GOVUK || {};
+
+ var DEFAULT_COOKIE_CONSENT = {
+ 'analytics': false
+ };
+
+ var COOKIE_CATEGORIES = {
+ '_ga': 'analytics',
+ '_gid': 'analytics'
+ };
/*
Cookie methods
@@ -19,38 +28,129 @@
Deleting a cookie:
GOVUK.cookie('hobnob', null);
*/
- GOVUK.cookie = function (name, value, options) {
- if(typeof value !== 'undefined'){
- if(value === false || value === null) {
- return GOVUK.setCookie(name, '', { days: -1 });
+ window.GOVUK.cookie = function (name, value, options) {
+ if (typeof value !== 'undefined') {
+ if (value === false || value === null) {
+ return window.GOVUK.setCookie(name, '', { days: -1 });
} else {
- return GOVUK.setCookie(name, value, options);
+ // Default expiry date of 30 days
+ if (typeof options === 'undefined') {
+ options = { days: 30 };
+ }
+ return window.GOVUK.setCookie(name, value, options);
}
} else {
- return GOVUK.getCookie(name);
+ return window.GOVUK.getCookie(name);
}
};
- GOVUK.setCookie = function (name, value, options) {
- if(typeof options === 'undefined') {
- options = {};
+
+ window.GOVUK.getConsentCookie = function () {
+ var consentCookie = window.GOVUK.cookie('cookies_policy');
+ var consentCookieObj;
+
+ if (consentCookie) {
+ try {
+ consentCookieObj = JSON.parse(consentCookie);
+ } catch (err) {
+ return null;
+ }
+
+ if (typeof consentCookieObj !== 'object' && consentCookieObj !== null) {
+ consentCookieObj = JSON.parse(consentCookieObj);
+ }
+ } else {
+ return null;
}
- var cookieString = name + "=" + value + "; path=/";
- if (options.days) {
- var date = new Date();
- date.setTime(date.getTime() + (options.days * 24 * 60 * 60 * 1000));
- cookieString = cookieString + "; expires=" + date.toGMTString();
- }
- if (document.location.protocol == 'https:'){
- cookieString = cookieString + "; Secure";
- }
- document.cookie = cookieString;
+
+ return consentCookieObj;
};
- GOVUK.getCookie = function (name) {
- var nameEQ = name + "=";
+
+ window.GOVUK.setConsentCookie = function (options) {
+ var cookieConsent = window.GOVUK.getConsentCookie();
+
+ if (!cookieConsent) {
+ cookieConsent = JSON.parse(JSON.stringify(DEFAULT_COOKIE_CONSENT));
+ }
+
+ for (var cookieType in options) {
+ cookieConsent[cookieType] = options[cookieType];
+
+ // Delete cookies of that type if consent being set to false
+ if (!options[cookieType]) {
+ for (var cookie in COOKIE_CATEGORIES) {
+ if (COOKIE_CATEGORIES[cookie] === cookieType) {
+ window.GOVUK.cookie(cookie, null);
+
+ if (window.GOVUK.cookie(cookie)) {
+ document.cookie = cookie + '=;expires=' + new Date() + ';domain=' + window.location.hostname.replace(/^www\./, '.') + ';path=/';
+ }
+ }
+ }
+ }
+ }
+
+ window.GOVUK.setCookie('cookies_policy', JSON.stringify(cookieConsent), { days: 365 });
+ };
+
+ window.GOVUK.checkConsentCookieCategory = function (cookieName, cookieCategory) {
+ var currentConsentCookie = window.GOVUK.getConsentCookie();
+
+ // If the consent cookie doesn't exist, but the cookie is in our known list, return true
+ if (!currentConsentCookie && COOKIE_CATEGORIES[cookieName]) {
+ return true;
+ }
+
+ currentConsentCookie = window.GOVUK.getConsentCookie();
+
+ // Sometimes currentConsentCookie is malformed in some of the tests, so we need to handle these
+ try {
+ return currentConsentCookie[cookieCategory];
+ } catch (e) {
+ console.error(e);
+ return false;
+ }
+ };
+
+ window.GOVUK.checkConsentCookie = function (cookieName, cookieValue) {
+ // If we're setting the consent cookie OR deleting a cookie, allow by default
+ if (cookieName === 'cookies_policy' || (cookieValue === null || cookieValue === false)) {
+ return true;
+ }
+
+ if (COOKIE_CATEGORIES[cookieName]) {
+ var cookieCategory = COOKIE_CATEGORIES[cookieName];
+
+ return window.GOVUK.checkConsentCookieCategory(cookieName, cookieCategory);
+ } else {
+ // Deny the cookie if it is not known to us
+ return false;
+ }
+ };
+
+ window.GOVUK.setCookie = function (name, value, options) {
+ if (window.GOVUK.checkConsentCookie(name, value)) {
+ if (typeof options === 'undefined') {
+ options = {};
+ }
+ var cookieString = name + '=' + value + '; path=/';
+ if (options.days) {
+ var date = new Date();
+ date.setTime(date.getTime() + (options.days * 24 * 60 * 60 * 1000));
+ cookieString = cookieString + '; expires=' + date.toGMTString();
+ }
+ if (document.location.protocol === 'https:') {
+ cookieString = cookieString + '; Secure';
+ }
+ document.cookie = cookieString;
+ }
+ };
+
+ window.GOVUK.getCookie = function (name) {
+ var nameEQ = name + '=';
var cookies = document.cookie.split(';');
- for(var i = 0, len = cookies.length; i < len; i++) {
+ for (var i = 0, len = cookies.length; i < len; i++) {
var cookie = cookies[i];
- while (cookie.charAt(0) == ' ') {
+ while (cookie.charAt(0) === ' ') {
cookie = cookie.substring(1, cookie.length);
}
if (cookie.indexOf(nameEQ) === 0) {
@@ -59,4 +159,5 @@
}
return null;
};
-}).call(this);
+}(window));
+
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 9c45e0508..44330747d 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -1,6 +1,10 @@
window.GOVUK.Frontend.initAll();
-$(() => GOVUK.addCookieMessage());
+window.GOVUK.Modules.CookieBanner.clearOldCookies();
+
+if (window.GOVUK.hasConsentFor('analytics')) {
+ window.GOVUK.initAnalytics();
+}
$(() => $("time.timeago").timeago());
diff --git a/app/assets/stylesheets/components/cookie-message.scss b/app/assets/stylesheets/components/cookie-message.scss
index 559e07bbf..f72132ab5 100644
--- a/app/assets/stylesheets/components/cookie-message.scss
+++ b/app/assets/stylesheets/components/cookie-message.scss
@@ -1,8 +1,123 @@
-.notify-cookie-message {
- @include govuk-font($size: 16);
- padding: govuk-spacing(3) 0;
+// GOV.UK Publishing components cookie banner styles
+// https://github.com/alphagov/govuk_publishing_components/blob/master/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss
+// sass-lint:disable mixins-before-declarations
- .js-enabled & {
- display: none;
+// component uses .govuk-body and .govuk-button classes from govuk-frontend
+@import 'core/typography';
+@import 'components/button/_button';
+
+.notify-cookie-banner__wrapper {
+ @include govuk-responsive-padding(4, "top");
+ @include govuk-responsive-padding(5, "bottom");
+}
+
+// component should only be shown if JS is available, by the cookieMessage JS, so hide by default
+.notify-cookie-banner {
+ display: none;
+}
+
+.notify-cookie-banner__buttons {
+ display: flex;
+ flex-wrap: wrap;
+
+ @include govuk-media-query($from: tablet) {
+ flex-wrap: nowrap;
}
}
+
+.notify-cookie-banner__button,
+.notify-cookie-banner__link {
+ vertical-align: baseline;
+}
+
+.notify-cookie-banner__button {
+ display: inline-block;
+ flex: 1 0;
+ padding-left: govuk-spacing(9);
+ padding-right: govuk-spacing(9);
+ margin-bottom: govuk-spacing(2);
+
+ @include govuk-media-query($from: tablet) {
+ flex: 0 0 150px;
+ padding-left: govuk-spacing(2);
+ padding-right: govuk-spacing(2);
+ margin-bottom: govuk-spacing(1);
+ }
+}
+
+.notify-cookie-banner__button-accept {
+ margin-right: govuk-spacing(4);
+}
+
+.notify-cookie-banner__link {
+ @include govuk-font(19);
+ line-height: 1;
+ display: block;
+ width: 100%;
+ padding: 9px 0px 6px;
+
+ @include govuk-media-query($from: tablet) {
+ display: inline;
+ width: auto;
+ margin-left: govuk-spacing(6);
+ }
+}
+
+.notify-cookie-banner__confirmation {
+ display: none;
+ position: relative;
+ padding: govuk-spacing(4) 0;
+
+ @include govuk-media-query($from: desktop) {
+ padding: govuk-spacing(4);
+ }
+
+ // This element is focused using JavaScript so that it's being read out by screen readers
+ // for this reason we don't want to show the default outline or emphasise it visually using `govuk-focused-text`
+ &:focus {
+ outline: none;
+ }
+}
+
+.notify-cookie-banner__confirmation-message,
+.notify-cookie-banner__hide-button {
+ display: block;
+
+ @include govuk-media-query($from: desktop) {
+ display: inline-block;
+ }
+}
+
+.notify-cookie-banner__confirmation-message {
+ margin-right: govuk-spacing(4);
+
+ @include govuk-media-query($from: desktop) {
+ max-width: 90%;
+ }
+}
+
+.notify-cookie-banner__hide-button {
+ @include govuk-font($size: 19);
+ color: $govuk-link-colour;
+ outline: 0;
+ border: 0;
+ background: none;
+ text-decoration: underline;
+ padding: govuk-spacing(0);
+ margin-top: govuk-spacing(2);
+ right: govuk-spacing(3);
+ cursor: pointer;
+
+ @include govuk-media-query($from: desktop) {
+ margin-top: govuk-spacing(0);
+ position: absolute;
+ right: govuk-spacing(4);
+ }
+}
+
+// Additions
+
+// Override margin-bottom, inherited from using .govuk-body class
+.notify-cookie-banner__confirmation-message {
+ margin-bottom: 0;
+}
diff --git a/app/assets/stylesheets/govuk-frontend/_all.scss b/app/assets/stylesheets/govuk-frontend/_all.scss
index 1f013e2c6..9b8755367 100644
--- a/app/assets/stylesheets/govuk-frontend/_all.scss
+++ b/app/assets/stylesheets/govuk-frontend/_all.scss
@@ -23,7 +23,9 @@ $govuk-assets-path: "/static/";
@import 'components/header/_header';
@import 'components/footer/_footer';
@import 'components/back-link/_back-link';
+@import 'components/button/_button';
@import 'components/details/_details';
+@import 'components/radios/_radios';
@import "utilities/all";
@import "overrides/all";
diff --git a/app/assets/stylesheets/govuk-frontend/extensions.scss b/app/assets/stylesheets/govuk-frontend/extensions.scss
index e28474b05..0d4b693fa 100644
--- a/app/assets/stylesheets/govuk-frontend/extensions.scss
+++ b/app/assets/stylesheets/govuk-frontend/extensions.scss
@@ -7,3 +7,4 @@
column-count: 4;
}
}
+
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index b1cb870aa..26b07297d 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -82,6 +82,7 @@ $path: '/static/images/';
@import 'views/send';
@import 'views/get_started';
@import 'views/history';
+@import 'views/cookies';
// TODO: break this up
@import 'app';
diff --git a/app/assets/stylesheets/views/cookies.scss b/app/assets/stylesheets/views/cookies.scss
new file mode 100644
index 000000000..05974bb08
--- /dev/null
+++ b/app/assets/stylesheets/views/cookies.scss
@@ -0,0 +1,17 @@
+.cookie-settings__form-wrapper {
+ display: none;
+
+ .js-enabled & {
+ display: block;
+ }
+}
+
+.cookie-settings__no-js {
+ .js-enabled & {
+ display: none;
+ }
+}
+
+.cookie-settings__confirmation {
+ display: none;
+}
diff --git a/app/main/views/feedback.py b/app/main/views/feedback.py
index 88e30973e..9cf0cd6a5 100644
--- a/app/main/views/feedback.py
+++ b/app/main/views/feedback.py
@@ -176,6 +176,7 @@ def is_weekend(time):
def is_bank_holiday(time):
return time.strftime('%Y-%m-%d') in {
# taken from https://www.gov.uk/bank-holidays.json
+ # curl https://www.gov.uk/bank-holidays.json | jq '."england-and-wales".events[].date'
"2016-01-01",
"2016-03-25",
"2016-03-28",
@@ -208,6 +209,22 @@ def is_bank_holiday(time):
"2019-08-26",
"2019-12-25",
"2019-12-26",
+ "2020-01-01",
+ "2020-04-10",
+ "2020-04-13",
+ "2020-05-08",
+ "2020-05-25",
+ "2020-08-31",
+ "2020-12-25",
+ "2020-12-28",
+ "2021-01-01",
+ "2021-04-02",
+ "2021-04-05",
+ "2021-05-03",
+ "2021-05-31",
+ "2021-08-30",
+ "2021-12-27",
+ "2021-12-28",
}
diff --git a/app/main/views/index.py b/app/main/views/index.py
index 8eb1b6584..a910963e6 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -343,3 +343,11 @@ def old_page_redirects():
'main.old_integration_testing': 'main.integration_testing',
}
return redirect(url_for(redirects[request.endpoint]), code=301)
+
+
+@main.route('/docs/notify-pdf-letter-spec-latest.pdf')
+def letter_spec():
+ return redirect(
+ 'https://docs.notifications.service.gov.uk'
+ '/documentation/images/notify-pdf-letter-spec-v2.4.pdf'
+ )
diff --git a/app/models/__init__.py b/app/models/__init__.py
index 91fed748f..4f8850e9d 100644
--- a/app/models/__init__.py
+++ b/app/models/__init__.py
@@ -55,7 +55,7 @@ class ModelList(ABC, Sequence):
@property
@abstractmethod
- def client(self):
+ def client_method(self):
pass
@property
@@ -64,7 +64,7 @@ class ModelList(ABC, Sequence):
pass
def __init__(self, *args):
- self.items = self.client(*args)
+ self.items = self.client_method(*args)
def __getitem__(self, index):
return self.model(self.items[index])
diff --git a/app/models/event.py b/app/models/event.py
index 43dfba627..de3d635cd 100644
--- a/app/models/event.py
+++ b/app/models/event.py
@@ -157,12 +157,12 @@ class APIKeyEvent(Event):
class APIKeyEvents(ModelList):
model = APIKeyEvent
- client = service_api_client.get_service_api_key_history
+ client_method = service_api_client.get_service_api_key_history
class ServiceEvents(ModelList):
- client = service_api_client.get_service_service_history
+ client_method = service_api_client.get_service_service_history
@property
def model(self):
@@ -187,5 +187,5 @@ class ServiceEvents(ModelList):
def __init__(self, service_id):
self.items = [
- event for event in self.splat(self.client(service_id)) if event.relevant
+ event for event in self.splat(self.client_method(service_id)) if event.relevant
]
diff --git a/app/models/job.py b/app/models/job.py
index 3c86c075e..f03b045fc 100644
--- a/app/models/job.py
+++ b/app/models/job.py
@@ -29,7 +29,6 @@ class Job(JSONModel):
'created_at',
'processing_started',
'notification_count',
- 'job_status',
'created_by',
}
@@ -39,7 +38,7 @@ class Job(JSONModel):
@property
def status(self):
- return self.job_status
+ return self._dict.get('job_status')
@property
def cancelled(self):
@@ -205,28 +204,28 @@ class Job(JSONModel):
class ImmediateJobs(ModelList):
- client = job_api_client.get_immediate_jobs
+ client_method = job_api_client.get_immediate_jobs
model = Job
class ScheduledJobs(ImmediateJobs):
- client = job_api_client.get_scheduled_jobs
+ client_method = job_api_client.get_scheduled_jobs
class PaginatedJobs(ImmediateJobs):
- client = job_api_client.get_page_of_jobs
+ client_method = job_api_client.get_page_of_jobs
def __init__(self, service_id, page=None):
try:
self.current_page = int(page)
except TypeError:
self.current_page = 1
- response = self.client(service_id, page=self.current_page)
+ response = self.client_method(service_id, page=self.current_page)
self.items = response['data']
self.prev_page = response.get('links', {}).get('prev', None)
self.next_page = response.get('links', {}).get('next', None)
class PaginatedUploads(PaginatedJobs):
- client = job_api_client.get_uploads
+ client_method = job_api_client.get_uploads
diff --git a/app/models/organisation.py b/app/models/organisation.py
index 966dce9bb..327be5670 100644
--- a/app/models/organisation.py
+++ b/app/models/organisation.py
@@ -200,5 +200,5 @@ class Organisation(JSONModel):
class Organisations(ModelList):
- client = organisations_client.get_organisations
+ client_method = organisations_client.get_organisations
model = Organisation
diff --git a/app/models/user.py b/app/models/user.py
index ac465000a..a1876d765 100644
--- a/app/models/user.py
+++ b/app/models/user.py
@@ -614,12 +614,9 @@ class AnonymousUser(AnonymousUserMixin):
class Users(ModelList):
- client = user_api_client.get_users_for_service
+ client_method = user_api_client.get_users_for_service
model = User
- def __init__(self, service_id):
- self.items = self.client(service_id)
-
def get_name_from_id(self, id):
for user in self:
if user.id == id:
@@ -628,21 +625,21 @@ class Users(ModelList):
class OrganisationUsers(Users):
- client = user_api_client.get_users_for_organisation
+ client_method = user_api_client.get_users_for_organisation
class InvitedUsers(Users):
- client = invite_api_client.get_invites_for_service
+ client_method = invite_api_client.get_invites_for_service
model = InvitedUser
def __init__(self, service_id):
self.items = [
- user for user in self.client(service_id)
+ user for user in self.client_method(service_id)
if user['status'] != 'accepted'
]
class OrganisationInvitedUsers(InvitedUsers):
- client = org_invite_api_client.get_invites_for_organisation
+ client_method = org_invite_api_client.get_invites_for_organisation
model = InvitedOrgUser
diff --git a/app/navigation.py b/app/navigation.py
index 354483c7d..8cbd0ecab 100644
--- a/app/navigation.py
+++ b/app/navigation.py
@@ -208,6 +208,7 @@ class HeaderNavigation(Navigation):
'invite_org_user',
'invite_user',
'no_cookie.letter_branding_preview_image',
+ 'letter_spec',
'letter_template',
'link_service_to_organisation',
'manage_org_users',
@@ -533,6 +534,7 @@ class MainNavigation(Navigation):
'no_cookie.letter_branding_preview_image',
'live_services',
'live_services_csv',
+ 'letter_spec',
'letter_template',
'message_status',
'manage_org_users',
@@ -763,6 +765,7 @@ class CaseworkNavigation(Navigation):
'invite_user',
'no_cookie.letter_branding_preview_image',
'letter_branding',
+ 'letter_spec',
'letter_template',
'link_service_to_organisation',
'live_services',
@@ -1049,6 +1052,7 @@ class OrgNavigation(Navigation):
'invite_user',
'letter_branding',
'no_cookie.letter_branding_preview_image',
+ 'letter_spec',
'letter_template',
'link_service_to_organisation',
'live_services',
diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index 59fcc33a1..d0837ea51 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -1,5 +1,6 @@
{% extends "template.njk" %}
{% from "components/banner.html" import banner %}
+{% from "components/cookie-banner.html" import cookie_banner %}
{% block headIcons %}
+
+
Can we store analytics cookies on your device?
+
Analytics cookies help us understand how our website is being used.
+
+
+
+
+
+
Cookies
- GOV.UK Notify puts small files (known as ‘cookies’)
- onto your computer.
-
-
These cookies are used to remember you once you’ve logged in.
-
- Find out how to manage cookies .
+ Cookies are small files saved on your phone, tablet or computer when you visit a website.
+
We use cookies to make GOV.UK Notify work and collect information about how you use our service.
-
Session cookies
+
Essential cookies
- We store session cookies on your computer to help keep your information
- secure while you use the service.
+ Essential cookies keep your information secure while you use Notify. We do not need to ask permission to use them.
+ Essential cookies
Name
@@ -37,22 +42,43 @@
notify_admin_session
- Used to keep you logged in
+ Used to keep you signed in
20 hours
+
+
+ cookie_policy
+
+
+ Saves your cookie consent settings
+
+
+ 1 year
+
+
-
Introductory message cookie
+
Analytics cookies (optional)
- When you first use the service, you may see a pop-up ‘welcome’ message.
- Once you’ve seen the message, we store a cookie on your computer so it
- knows not to show it again.
+ With your permission, we use Google Analytics to collect data about how you use Notify. This information helps us to improve our service.
+
+ Google is not allowed to use or share our analytics data with anyone.
+
+
+ Google Analytics stores anonymised information about:
+
+
+ how you got to GOV.UK Notify
+ the pages you visit on Notify and how long you spend on them
+ any errors you see while using Notify
+
+ Google Analytics cookies
Name
@@ -63,18 +89,62 @@
- seen_cookie_message
+ _ga
- Saves a message to let us know that you have seen our cookie
- message
+ Checks if you’ve visited Notify before. This helps us count how many people visit our site.
- 1 month
+ 2 years
+
+
+
+
+ _gid
+
+
+ Checks if you’ve visited Notify before. This helps us count how many people visit our site.
+
+
+ 24 hours
+
+
Do you want to accept analytics cookies?
+
We use Javascript to set our analytics cookies. Unfortunately Javascript is not running on your browser, so you cannot change your settings. You can try:
+
+ reloading the page
+ turning on Javascript in your browser
+
+
+
diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html
index 6c5a40c2b..1b498a05b 100644
--- a/app/templates/views/features/letters.html
+++ b/app/templates/views/features/letters.html
@@ -33,7 +33,7 @@
Upload your own letters
You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.
- Use the letter specification document to help you set up your letter, save it as a PDF, then upload it to Notify.
+
Use the letter specification document to help you set up your letter, save it as a PDF, then upload it to Notify.
Read our API documentation for more information.
Pricing
diff --git a/app/templates/views/notifications/notification.html b/app/templates/views/notifications/notification.html
index f9ffe85ef..f422414ea 100644
--- a/app/templates/views/notifications/notification.html
+++ b/app/templates/views/notifications/notification.html
@@ -44,7 +44,7 @@
{% elif notification_status == 'validation-failed' %}
- Validation failed – {{ message.title | safe }}. {{ message.detail | safe }}
+ {{ message.summary | safe }}
{% elif notification_status == 'technical-failure' %}
diff --git a/app/templates/views/privacy.html b/app/templates/views/privacy.html
index 281e7cfb2..b4f2cf6de 100644
--- a/app/templates/views/privacy.html
+++ b/app/templates/views/privacy.html
@@ -61,7 +61,7 @@
We will retain your personal data for as long as you have a GOV.UK Notify account.
- Where your data is processed and stores
+ Where your data is processed and stored
We design, build and run our systems to make sure that your data is as safe as possible at any stage, both while it’s
processed and when it’s stored.
diff --git a/app/templates/views/uploads/choose-file.html b/app/templates/views/uploads/choose-file.html
index 855134988..70adde281 100644
--- a/app/templates/views/uploads/choose-file.html
+++ b/app/templates/views/uploads/choose-file.html
@@ -33,7 +33,7 @@
)}}
You can upload a single letter as a PDF.
- Your file must meet our letter specification .
+ Your file must meet our letter specification .
To help you set up your letter you can download a Word document template .
diff --git a/app/utils.py b/app/utils.py
index af2537a05..3f8a3b599 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -569,32 +569,61 @@ def get_letter_printing_statement(status, created_at):
LETTER_VALIDATION_MESSAGES = {
'letter-not-a4-portrait-oriented': {
'title': 'Your letter is not A4 portrait size',
- 'detail': 'You need to change the size or orientation of {invalid_pages}. letter specification .'
+ 'detail': (
+ 'You need to change the size or orientation of {invalid_pages}. letter specification .'
+ ),
+ 'summary': (
+ 'Validation failed because {invalid_pages} {invalid_pages_are_or_is} not A4 portrait size.letter specification .'
+ ),
},
'content-outside-printable-area': {
'title': 'Your content is outside the printable area',
- 'detail': 'You need to edit {invalid_pages}.letter specification .'
+ 'detail': (
+ 'You need to edit {invalid_pages}.letter specification .'
+ ),
+ 'summary': (
+ 'Validation failed because content is outside the printable area on {invalid_pages}.letter specification .'
+ ),
},
'letter-too-long': {
'title': 'Your letter is too long',
- 'detail': 'Letters must be 10 pages or less. letter specification .'
+ 'detail': (
+ 'You need to add a recipient address.letter specification .'
+ ),
+ 'summary': (
+ 'Validation failed because the address block is empty.letter specification .'
+ ),
}
}
@@ -603,6 +632,8 @@ def get_letter_validation_error(validation_message, invalid_pages=None, page_cou
if validation_message not in LETTER_VALIDATION_MESSAGES:
return {'title': 'Validation failed'}
+ invalid_pages_are_or_is = 'is' if len(invalid_pages) == 1 else 'are'
+
invalid_pages = unescaped_formatted_list(
invalid_pages or [],
before_each='',
@@ -615,8 +646,16 @@ def get_letter_validation_error(validation_message, invalid_pages=None, page_cou
'title': LETTER_VALIDATION_MESSAGES[validation_message]['title'],
'detail': LETTER_VALIDATION_MESSAGES[validation_message]['detail'].format(
invalid_pages=invalid_pages,
+ invalid_pages_are_or_is=invalid_pages_are_or_is,
page_count=page_count,
- )
+ letter_spec=url_for('.letter_spec'),
+ ),
+ 'summary': LETTER_VALIDATION_MESSAGES[validation_message]['summary'].format(
+ invalid_pages=invalid_pages,
+ invalid_pages_are_or_is=invalid_pages_are_or_is,
+ page_count=page_count,
+ letter_spec=url_for('.letter_spec'),
+ ),
}
diff --git a/gulpfile.js b/gulpfile.js
index 257aef277..52f713f2b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -142,7 +142,11 @@ const javascripts = () => {
paths.toolkit + 'javascripts/govuk/modules.js',
paths.toolkit + 'javascripts/govuk/show-hide-content.js',
paths.src + 'javascripts/govuk/cookie-functions.js',
+ paths.src + 'javascripts/consent.js',
+ paths.src + 'javascripts/analytics/analytics.js',
+ paths.src + 'javascripts/analytics/init.js',
paths.src + 'javascripts/cookieMessage.js',
+ paths.src + 'javascripts/cookieSettings.js',
paths.src + 'javascripts/stick-to-window-when-scrolling.js',
paths.src + 'javascripts/apiKey.js',
paths.src + 'javascripts/autofocus.js',
@@ -160,7 +164,7 @@ const javascripts = () => {
paths.src + 'javascripts/templateFolderForm.js',
paths.src + 'javascripts/collapsibleCheckboxes.js',
paths.src + 'javascripts/radioSlider.js',
- paths.src + 'javascripts/main.js'
+ paths.src + 'javascripts/main.js',
])
.pipe(plugins.prettyerror())
.pipe(plugins.babel({
diff --git a/tests/__init__.py b/tests/__init__.py
index 5555b853e..d1382c2b3 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -545,7 +545,7 @@ def validate_route_permission(mocker,
mocker.patch('app.user_api_client.get_user', return_value=usr)
mocker.patch('app.user_api_client.get_user_by_email', return_value=usr)
mocker.patch('app.service_api_client.get_service', return_value={'data': service})
- mocker.patch('app.models.user.Users.client', return_value=[usr])
+ mocker.patch('app.models.user.Users.client_method', return_value=[usr])
mocker.patch('app.job_api_client.has_jobs', return_value=False)
with app_.test_request_context():
with app_.test_client() as client:
diff --git a/tests/app/main/views/organisations/test_organisation.py b/tests/app/main/views/organisations/test_organisation.py
index dad10f81b..39bd5f0cb 100644
--- a/tests/app/main/views/organisations/test_organisation.py
+++ b/tests/app/main/views/organisations/test_organisation.py
@@ -27,7 +27,7 @@ def test_organisation_page_shows_all_organisations(
]
get_organisations = mocker.patch(
- 'app.models.organisation.Organisations.client', return_value=orgs
+ 'app.models.organisation.Organisations.client_method', return_value=orgs
)
response = platform_admin_client.get(
url_for('.organisations')
@@ -232,7 +232,7 @@ def test_nhs_local_can_create_own_organisations(
):
mocker.patch('app.organisations_client.get_service_organisation', return_value=organisation)
mocker.patch(
- 'app.models.organisation.Organisations.client',
+ 'app.models.organisation.Organisations.client_method',
return_value=[
organisation_json('t1', 'Trust 1', organisation_type='nhs_local'),
organisation_json('t2', 'Trust 2', organisation_type='nhs_local'),
@@ -366,7 +366,7 @@ def test_nhs_local_assigns_to_selected_organisation(
):
mocker.patch('app.organisations_client.get_service_organisation', return_value=None)
mocker.patch(
- 'app.models.organisation.Organisations.client',
+ 'app.models.organisation.Organisations.client_method',
return_value=[
organisation_json(ORGANISATION_ID, 'Trust 1', organisation_type='nhs_local'),
],
diff --git a/tests/app/main/views/test_accept_invite.py b/tests/app/main/views/test_accept_invite.py
index 17a49328c..cbd280ffe 100644
--- a/tests/app/main/views/test_accept_invite.py
+++ b/tests/app/main/views/test_accept_invite.py
@@ -180,7 +180,7 @@ def test_existing_user_of_service_get_redirected_to_signin(
):
sample_invite['email_address'] = api_user_active['email_address']
mocker.patch('app.invite_api_client.check_token', return_value=sample_invite)
- mocker.patch('app.models.user.Users.client', return_value=[api_user_active])
+ mocker.patch('app.models.user.Users.client_method', return_value=[api_user_active])
response = client.get(url_for('main.accept_invite', token='thisisnotarealtoken'), follow_redirects=True)
assert response.status_code == 200
@@ -432,7 +432,7 @@ def test_accept_invite_does_not_treat_email_addresses_as_case_sensitive(
# the email address of api_user_active is 'test@user.gov.uk'
sample_invite['email_address'] = 'TEST@user.gov.uk'
mocker.patch('app.invite_api_client.check_token', return_value=sample_invite)
- mocker.patch('app.models.user.Users.client', return_value=[api_user_active])
+ mocker.patch('app.models.user.Users.client_method', return_value=[api_user_active])
client_request.get(
'main.accept_invite',
diff --git a/tests/app/main/views/test_code_not_received.py b/tests/app/main/views/test_code_not_received.py
index c3f282c21..23712125e 100644
--- a/tests/app/main/views/test_code_not_received.py
+++ b/tests/app/main/views/test_code_not_received.py
@@ -22,7 +22,7 @@ def test_should_render_email_verification_resend_show_email_address_and_resend_v
assert page.h1.string == 'Check your email'
expected = "A new confirmation email has been sent to {}".format(api_user_active['email_address'])
- message = page.find_all('p')[1].text
+ message = page.select('main p')[0].text
assert message == expected
mock_send_verify_email.assert_called_with(api_user_active['id'], api_user_active['email_address'])
@@ -66,7 +66,7 @@ def test_should_render_correct_resend_template_for_pending_user(
assert page.h1.string == 'Check your mobile number'
expected = 'Check your mobile phone number is correct and then resend the security code.'
- message = page.find_all('p')[1].text
+ message = page.select('main p')[0].text
assert message == expected
assert page.find('form').input['value'] == api_user_pending['mobile_number']
diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py
index 2b5232178..38c12b34d 100644
--- a/tests/app/main/views/test_index.py
+++ b/tests/app/main/views/test_index.py
@@ -254,3 +254,26 @@ def test_letter_template_preview_headers(
)
assert response.headers.get('X-Frame-Options') == 'SAMEORIGIN'
+
+
+def test_letter_spec_redirect(client_request):
+ client_request.get(
+ 'main.letter_spec',
+ _expected_status=302,
+ _expected_redirect=(
+ 'https://docs.notifications.service.gov.uk'
+ '/documentation/images/notify-pdf-letter-spec-v2.4.pdf'
+ ),
+ )
+
+
+def test_letter_spec_redirect_with_non_logged_in_user(client_request):
+ client_request.logout()
+ client_request.get(
+ 'main.letter_spec',
+ _expected_status=302,
+ _expected_redirect=(
+ 'https://docs.notifications.service.gov.uk'
+ '/documentation/images/notify-pdf-letter-spec-v2.4.pdf'
+ ),
+ )
diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py
index 25a79afdf..c82ead594 100644
--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -543,7 +543,7 @@ def test_should_show_scheduled_job(
template_id='5d729fbd-239c-44ab-b498-75a985f3198f',
version=1,
)
- assert page.select_one('button[type=submit]').text.strip() == 'Cancel sending'
+ assert page.select_one('main button[type=submit]').text.strip() == 'Cancel sending'
def test_should_cancel_job(
diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py
index 07f3ec1b6..bdaac53d0 100644
--- a/tests/app/main/views/test_manage_users.py
+++ b/tests/app/main/views/test_manage_users.py
@@ -135,7 +135,7 @@ def test_should_show_overview_page(
other_user['id'] = 'zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz'
mocker.patch('app.user_api_client.get_user', return_value=current_user)
- mock_get_users = mocker.patch('app.models.user.Users.client', return_value=[
+ mock_get_users = mocker.patch('app.models.user.Users.client_method', return_value=[
current_user,
other_user,
])
@@ -166,7 +166,7 @@ def test_should_show_caseworker_on_overview_page(
other_user['email_address'] = 'zzzzzzz@example.gov.uk'
mocker.patch('app.user_api_client.get_user', return_value=current_user)
- mocker.patch('app.models.user.Users.client', return_value=[
+ mocker.patch('app.models.user.Users.client_method', return_value=[
current_user,
other_user,
])
@@ -699,8 +699,8 @@ def test_invite_user(
sample_invite['email_address'] = 'test@example.gov.uk'
assert is_gov_user(email_address) == gov_user
- mocker.patch('app.models.user.InvitedUsers.client', return_value=[sample_invite])
- mocker.patch('app.models.user.Users.client', return_value=[active_user_with_permissions])
+ mocker.patch('app.models.user.InvitedUsers.client_method', return_value=[sample_invite])
+ mocker.patch('app.models.user.Users.client_method', return_value=[active_user_with_permissions])
mocker.patch('app.invite_api_client.create_invite', return_value=sample_invite)
page = client_request.post(
'main.invite_user',
@@ -753,8 +753,8 @@ def test_invite_user_with_email_auth_service(
sample_invite['email_address'] = 'test@example.gov.uk'
assert is_gov_user(email_address) is gov_user
- mocker.patch('app.models.user.InvitedUsers.client', return_value=[sample_invite])
- mocker.patch('app.models.user.Users.client', return_value=[active_user_with_permissions])
+ mocker.patch('app.models.user.InvitedUsers.client_method', return_value=[sample_invite])
+ mocker.patch('app.models.user.Users.client_method', return_value=[active_user_with_permissions])
mocker.patch('app.invite_api_client.create_invite', return_value=sample_invite)
page = client_request.post(
@@ -855,8 +855,8 @@ def test_manage_users_shows_invited_user(
expected_text,
):
sample_invite['status'] = invite_status
- mocker.patch('app.models.user.InvitedUsers.client', return_value=[sample_invite])
- mocker.patch('app.models.user.Users.client', return_value=[active_user_with_permissions])
+ mocker.patch('app.models.user.InvitedUsers.client_method', return_value=[sample_invite])
+ mocker.patch('app.models.user.Users.client_method', return_value=[active_user_with_permissions])
page = client_request.get('main.manage_users', service_id=SERVICE_ONE_ID)
assert page.h1.string.strip() == 'Team members'
@@ -873,8 +873,8 @@ def test_manage_users_does_not_show_accepted_invite(
invited_user_id = uuid.uuid4()
sample_invite['id'] = invited_user_id
sample_invite['status'] = 'accepted'
- mocker.patch('app.models.user.InvitedUsers.client', return_value=[sample_invite])
- mocker.patch('app.models.user.Users.client', return_value=[active_user_with_permissions])
+ mocker.patch('app.models.user.InvitedUsers.client_method', return_value=[sample_invite])
+ mocker.patch('app.models.user.Users.client_method', return_value=[active_user_with_permissions])
page = client_request.get('main.manage_users', service_id=SERVICE_ONE_ID)
@@ -1018,7 +1018,7 @@ def test_can_invite_user_as_platform_admin(
mock_get_template_folders,
mocker,
):
- mocker.patch('app.models.user.Users.client', return_value=[active_user_with_permissions])
+ mocker.patch('app.models.user.Users.client_method', return_value=[active_user_with_permissions])
page = client_request.get(
'main.manage_users',
@@ -1046,7 +1046,7 @@ def test_edit_user_email_page(
assert page.find('h1').text == "Change team member’s email address"
assert page.select('p[id=user_name]')[0].text == "This will change the email address for {}.".format(user['name'])
assert page.select('input[type=email]')[0].attrs["value"] == user['email_address']
- assert page.select('button[type=submit]')[0].text == "Save"
+ assert page.select('main button[type=submit]')[0].text == "Save"
def test_edit_user_email_page_404_for_non_team_member(
@@ -1252,7 +1252,7 @@ def test_confirm_edit_user_email_changes_user_email(
# We want active_user_with_permissions (the current user) to update the email address for api_user_active
# By default both users would have the same id, so we change the id of api_user_active
api_user_active['id'] = str(uuid.uuid4())
- mocker.patch('app.models.user.Users.client', return_value=[api_user_active, active_user_with_permissions])
+ mocker.patch('app.models.user.Users.client_method', return_value=[api_user_active, active_user_with_permissions])
# get_user gets called twice - first to check if current user can see the page, then to see if the team member
# whose email address we're changing belongs to the service
mocker.patch('app.user_api_client.get_user',
@@ -1367,7 +1367,7 @@ def test_edit_user_mobile_number_page(
"This will change the mobile number for {}."
).format(active_user_with_permissions['name'])
assert page.select('input[name=mobile_number]')[0].attrs["value"] == "0770••••762"
- assert page.select('button[type=submit]')[0].text == "Save"
+ assert page.select('main button[type=submit]')[0].text == "Save"
def test_edit_user_mobile_number_redirects_to_confirmation(
@@ -1468,7 +1468,7 @@ def test_confirm_edit_user_mobile_number_changes_user_mobile_number(
# By default both users would have the same id, so we change the id of api_user_active
api_user_active['id'] = str(uuid.uuid4())
- mocker.patch('app.models.user.Users.client', return_value=[api_user_active, active_user_with_permissions])
+ mocker.patch('app.models.user.Users.client_method', return_value=[api_user_active, active_user_with_permissions])
# get_user gets called twice - first to check if current user can see the page, then to see if the team member
# whose mobile number we're changing belongs to the service
mocker.patch('app.user_api_client.get_user',
diff --git a/tests/app/main/views/test_notifications.py b/tests/app/main/views/test_notifications.py
index 9e1c1bcdf..012ccaa1a 100644
--- a/tests/app/main/views/test_notifications.py
+++ b/tests/app/main/views/test_notifications.py
@@ -331,9 +331,10 @@ def test_notification_page_shows_validation_failed_precompiled_letter(
)
error_message = page.find('p', class_='notification-status-cancelled').text
- assert normalize_spaces(error_message) == \
- "Validation failed – Your content is outside the printable area. " \
- "You need to edit page 1.Files must meet our letter specification."
+ assert normalize_spaces(error_message) == (
+ 'Validation failed because content is outside the printable area on page 1.'
+ 'Files must meet our letter specification.'
+ )
assert not page.select('p.notification-status')
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index 45e7217c7..c6ca1dedb 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -1003,7 +1003,7 @@ def test_send_test_doesnt_show_file_contents(
assert page.select('h1')[0].text.strip() == 'Preview of ‘Two week reminder’'
assert len(page.select('table')) == 0
assert len(page.select('.banner-dangerous')) == 0
- assert page.select_one('button[type=submit]').text.strip() == 'Send 1 text message'
+ assert page.select_one('main button[type=submit]').text.strip() == 'Send 1 text message'
@pytest.mark.parametrize('user, endpoint, template_type, content_has_placeholders, expected_recipient', [
@@ -2229,7 +2229,7 @@ def test_letter_can_only_be_sent_now(
assert 'name="scheduled_for"' not in page
assert normalize_spaces(
- page.select_one('[type=submit]').text
+ page.select_one('main [type=submit]').text
) == (
'Send 1 letter'
)
@@ -2259,7 +2259,7 @@ def test_send_button_is_correctly_labelled(
)
assert normalize_spaces(
- page.select_one('[type=submit]').text
+ page.select_one('main [type=submit]').text
) == (
'Send 1,000 text messages'
)
@@ -2891,7 +2891,7 @@ def test_check_messages_does_not_allow_to_send_letter_longer_than_10_pages(
assert page.find('h1', {"data-error-type": "letter-too-long"})
assert len(page.select('.letter img')) == 10 # if letter longer than 10 pages, only 10 first pages are displayed
- assert not page.select('[type=submit]')
+ assert not page.select('main [type=submit]')
def test_check_messages_shows_data_errors_before_trial_mode_errors_for_letters(
@@ -3218,7 +3218,7 @@ def test_send_one_off_letter_errors_in_trial_mode(
assert len(page.select('.letter img')) == 5
- assert not page.select('[type=submit]')
+ assert not page.select('main [type=submit]')
assert page.select_one('.govuk-back-link').text == 'Back'
assert page.select_one('a[download]').text == 'Download as a PDF'
@@ -3259,7 +3259,7 @@ def test_send_one_off_letter_errors_if_letter_longer_than_10_pages(
assert page.find('h1', {"data-error-type": "letter-too-long"})
assert len(page.select('.letter img')) == 10
- assert not page.select('[type=submit]')
+ assert not page.select('main [type=submit]')
def test_check_messages_shows_over_max_row_error(
diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py
index de9e6316f..2f4cdae33 100644
--- a/tests/app/main/views/test_service_settings.py
+++ b/tests/app/main/views/test_service_settings.py
@@ -435,7 +435,7 @@ def test_show_restricted_service(
)
assert page.find('h1').text == 'Settings'
- assert page.find_all('h2')[0].text == 'Your service is in trial mode'
+ assert page.select('main h2')[0].text == 'Your service is in trial mode'
request_to_live = page.select('main p')[1]
request_to_live_link = request_to_live.select_one('a')
@@ -763,7 +763,7 @@ def test_should_check_for_sending_things_right(
}.get(template_type)
active_user_with_permissions,
mock_get_users = mocker.patch(
- 'app.models.user.Users.client',
+ 'app.models.user.Users.client_method',
return_value=(
[active_user_with_permissions] * count_of_users_with_manage_service +
[active_user_no_settings_permission]
@@ -783,7 +783,7 @@ def test_should_check_for_sending_things_right(
invite_two['permissions'] = 'view_activity'
mock_get_invites = mocker.patch(
- 'app.models.user.InvitedUsers.client',
+ 'app.models.user.InvitedUsers.client_method',
return_value=(
([invite_one] * count_of_invites_with_manage_service) +
[invite_two]
@@ -889,7 +889,7 @@ def test_should_not_show_go_live_button_if_checklist_not_complete(
page.select_one('[type=submit]').text.strip() == ('Request to go live')
else:
assert not page.select('form')
- assert not page.select('[type=submit]')
+ assert not page.select('main [type=submit]')
assert len(page.select('main p')) == 1
assert normalize_spaces(page.select_one('main p').text) == (
'You must complete these steps before you can request to go live.'
@@ -1192,8 +1192,8 @@ def test_non_gov_user_is_told_they_cant_go_live(
assert normalize_spaces(page.select_one('main p').text) == (
'Only team members with a government email address can request to go live.'
)
- assert len(page.select('form')) == 0
- assert len(page.select('button')) == 1
+ assert len(page.select('main form')) == 0
+ assert len(page.select('main button')) == 0
@pytest.mark.parametrize('consent_to_research, displayed_consent', (
diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py
index 0e317fc15..f61557879 100644
--- a/tests/app/main/views/test_template_folders.py
+++ b/tests/app/main/views/test_template_folders.py
@@ -480,7 +480,7 @@ def test_get_manage_folder_page(
_folder('folder_two', folder_id, None, [active_user_with_permissions['id']]),
]
mocker.patch(
- 'app.models.user.Users.client',
+ 'app.models.user.Users.client_method',
return_value=[active_user_with_permissions],
)
page = client_request.get(
@@ -514,7 +514,7 @@ def test_get_manage_folder_viewing_permissions_for_users(
_folder('folder_two', folder_id, None, [active_user_with_permissions['id'], team_member_2['id']]),
]
mocker.patch(
- 'app.models.user.Users.client',
+ 'app.models.user.Users.client_method',
return_value=[active_user_with_permissions, team_member, team_member_2],
)
@@ -566,7 +566,7 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_when_no_man
]},
]
mocker.patch(
- 'app.models.user.Users.client',
+ 'app.models.user.Users.client_method',
return_value=[active_user_with_permissions, team_member, team_member_2],
)
@@ -600,7 +600,7 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_for_service
]},
]
mocker.patch(
- 'app.models.user.Users.client',
+ 'app.models.user.Users.client_method',
return_value=[active_user_with_permissions],
)
@@ -712,7 +712,7 @@ def test_rename_folder(client_request, active_user_with_permissions, service_one
_folder('folder_two', folder_id, None, [active_user_with_permissions['id']])
]
mocker.patch(
- 'app.models.user.Users.client',
+ 'app.models.user.Users.client_method',
return_value=[active_user_with_permissions],
)
@@ -745,7 +745,7 @@ def test_manage_folder_users(
_folder('folder_two', folder_id, None, [active_user_with_permissions['id'], team_member['id']])
]
mocker.patch(
- 'app.models.user.Users.client',
+ 'app.models.user.Users.client_method',
return_value=[active_user_with_permissions, team_member],
)
@@ -788,7 +788,7 @@ def test_manage_folder_users_doesnt_change_permissions_current_user_cannot_manag
]}
]
mocker.patch(
- 'app.models.user.Users.client',
+ 'app.models.user.Users.client_method',
return_value=[active_user_with_permissions, team_member],
)
@@ -835,18 +835,18 @@ def test_delete_template_folder_should_request_confirmation(
assert page.select_one('input[name=name]')['value'] == 'sacrifice'
- assert len(page.select('form')) == 2
- assert len(page.select('button')) == 3
+ assert len(page.select('main form')) == 2
+ assert len(page.select('main button')) == 2
- assert 'action' not in page.select('form')[0]
- assert page.select('form button')[0].text == 'Yes, delete'
+ assert 'action' not in page.select('main form')[0]
+ assert page.select('main form button')[0].text == 'Yes, delete'
- assert page.select('form')[1]['action'] == url_for(
+ assert page.select('main form')[1]['action'] == url_for(
'main.manage_template_folder',
service_id=service_one['id'],
template_folder_id=folder_id,
)
- assert page.select('form button')[1].text == 'Save'
+ assert page.select('main form button')[1].text == 'Save'
def test_delete_template_folder_should_detect_non_empty_folder_on_get(
diff --git a/tests/app/main/views/test_uploads.py b/tests/app/main/views/test_uploads.py
index e0263f945..ed46f500e 100644
--- a/tests/app/main/views/test_uploads.py
+++ b/tests/app/main/views/test_uploads.py
@@ -103,7 +103,7 @@ def test_post_upload_letter_redirects_for_valid_file(
assert not page.find(id='validation-error-message')
assert page.find('input', {'type': 'hidden', 'name': 'file_id', 'value': fake_uuid})
- assert page.find('button', {'type': 'submit'}).text == 'Send 1 letter'
+ assert page.select('main button[type=submit]')[0].text == 'Send 1 letter'
def test_post_upload_letter_shows_letter_preview_for_valid_file(
@@ -406,7 +406,7 @@ def test_uploaded_letter_preview_does_not_show_send_button_if_service_in_trial_m
'Recipient: The Queen'
)
assert not page.find('form')
- assert not page.find('button', {'type': 'submit'})
+ assert len(page.select('main button[type=submit]')) == 0
@pytest.mark.parametrize('invalid_pages, page_requested, overlay_expected', (
diff --git a/tests/app/main/views/test_verify.py b/tests/app/main/views/test_verify.py
index 47f7c7218..f143d382a 100644
--- a/tests/app/main/views/test_verify.py
+++ b/tests/app/main/views/test_verify.py
@@ -22,7 +22,7 @@ def test_should_return_verify_template(
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.text == 'Check your phone'
- message = page.find_all('p')[1].text
+ message = page.select('main p')[0].text
assert message == "We’ve sent you a text message with a security code."
diff --git a/tests/app/test_utils.py b/tests/app/test_utils.py
index 8a62252d4..a8dc0755b 100644
--- a/tests/app/test_utils.py
+++ b/tests/app/test_utils.py
@@ -4,6 +4,8 @@ from io import StringIO
from pathlib import Path
import pytest
+from bs4 import BeautifulSoup
+from flask import url_for
from freezegun import freeze_time
from app import format_datetime_relative
@@ -413,24 +415,94 @@ def test_get_letter_validation_error_for_unknown_error():
}
-@pytest.mark.parametrize('error_message, expected_title, expected_content', [
- ('letter-not-a4-portrait-oriented', 'Your letter is not A4 portrait size',
- 'You need to change the size or orientation of page 2. letter specification .'),
- ('content-outside-printable-area', 'Your content is outside the printable area',
- 'You need to edit page 2.letter specification .'),
- ('letter-too-long', 'Your letter is too long',
- 'Letters must be 10 pages or less.
+
+
Cookies on GOV.UK Notify
+
We use small files called cookies to make GOV.UK Notify work.
+
+
+
We'd also like to use analytics cookies to help us improve our service.
+
Please let us know if this is OK.
+
+
+
+
+
Cookies
+
+ Cookies are small files saved on your phone, tablet or computer when you visit a website.
+
+ We use cookies to make GOV.UK Notify work and collect information about how you use our service.
+
+
Do you want to accept analytics cookies?
+
We use Javascript to set most of our cookies. Unfortunately Javascript is not running on your browser, so you cannot change your settings. You can try:
+
+ reloading the page
+ turning on Javascript in your browser
+
+
Analytics cookies (optional)
+ `;
+
+ document.body.innerHTML += cookiesPageContent;
+
+ yesRadio = document.querySelector('#cookies-analytics-yes');
+ noRadio = document.querySelector('#cookies-analytics-no');
+ saveButton = document.querySelector('.govuk-button');
+
+ });
+
+ afterEach(() => {
+
+ document.body.innerHTML = '';
+
+ // remove cookie set by tests
+ helpers.deleteCookie('cookies_policy');
+
+ // reset spies
+ window.ga.mockClear();
+ window.GOVUK.initAnalytics.mockClear();
+
+ // remove analytics tracker
+ delete window.GOVUK.analytics;
+
+ // reset global variable to state when init.js loaded
+ window['ga-disable-UA-26179049-1'] = true;
+
+ });
+
+ /*
+ Note: If no JS, the cookies page contains content to explain why JS is required to set analytics cookies.
+ This is hidden if JS is available when the page loads.
+
+ The message displayed to confirm any selection made is also in the page but hidden on load.
+
+ Both of these work through CSS, based on the presence of the `js-enabled` class on the so are not tested here.
+ */
+
+ describe("When the page loads", () => {
+
+ test("If user has not chosen to accept or reject analytics, the radios for making that choice should be set to unchecked", () => {
+
+ window.GOVUK.modules.start();
+
+ expect(yesRadio.checked).toBe(false);
+ expect(noRadio.checked).toBe(false);
+
+ });
+
+ test("If analytics are accepted, the radio for 'accept analytics' should be set to checked", () => {
+
+ window.GOVUK.setConsentCookie({ 'analytics': true });
+
+ window.GOVUK.modules.start();
+
+ expect(yesRadio.checked).toBe(true);
+ expect(noRadio.checked).toBe(false);
+
+ });
+
+ test("If analytics are rejected, the radio for 'reject analytics' should be set to checked", () => {
+
+ window.GOVUK.setConsentCookie({ 'analytics': false });
+
+ window.GOVUK.modules.start();
+
+ expect(yesRadio.checked).toBe(false);
+ expect(noRadio.checked).toBe(true);
+
+ });
+
+ });
+
+ describe("When the 'Save cookie settings' button is clicked", () => {
+
+ beforeEach(() => {
+
+ window.GOVUK.modules.start();
+
+ });
+
+ test("If no selection is made, set consent to reject analytics", () => {
+
+ helpers.triggerEvent(saveButton, 'click');
+
+ expect(window.GOVUK.getConsentCookie()).toEqual({ 'analytics': false });
+
+ });
+
+ test("If a selection is made, save this as consent", () => {
+
+ yesRadio.checked = true;
+
+ helpers.triggerEvent(saveButton, 'click');
+
+ expect(window.GOVUK.getConsentCookie()).toEqual({ 'analytics': true });
+
+ });
+
+ describe("The message confirming your choice", () => {
+
+ let confirmationMessage;
+
+ beforeEach(() => {
+
+ confirmationMessage = document.querySelector('.cookie-settings__confirmation');
+ helpers.triggerEvent(saveButton, 'click');
+
+ });
+
+ test("Should be shown when the 'Save cookie settings' button is clicked", () => {
+
+ expect(helpers.element(confirmationMessage).is('hidden')).toBe(false);
+
+ });
+
+ test("Should include a link to the last page visited, if information on the referrer is available", () => {
+
+ jest.spyOn(document, 'referrer', 'get').mockReturnValue('https://notifications.service.gov.uk/privacy');
+
+ helpers.triggerEvent(saveButton, 'click');
+
+ expect(confirmationMessage.querySelector('.cookie-settings__prev-page').getAttribute('href')).toEqual('/privacy');
+
+ });
+
+ });
+
+ describe("Analytics code", () => {
+
+ beforeAll(() => {
+
+ jest.spyOn(window, 'location', 'get').mockImplementation(() => {
+
+ return {
+ 'pathname': '/privacy',
+ 'search': ''
+ }
+
+ });
+
+ });
+
+ test("if user accepted analytics, the analytics code should initialise and register a pageview", () => {
+
+ window.GOVUK.modules.start();
+
+ yesRadio.checked = true;
+
+ helpers.triggerEvent(saveButton, 'click');
+
+ expect(window.GOVUK.initAnalytics).toHaveBeenCalled();
+
+ expect(window.ga).toHaveBeenCalled();
+ // the first 4 calls are configuration
+ expect(window.ga.mock.calls[4]).toEqual(['send', 'pageview', '/privacy']);
+
+ });
+
+ test("if user rejected analytics, the analytics code should not run", () => {
+
+ window.GOVUK.modules.start();
+
+ noRadio.checked = true;
+
+ helpers.triggerEvent(saveButton, 'click');
+
+ expect(window.GOVUK.initAnalytics).not.toHaveBeenCalled();
+
+ });
+
+ });
+
+ });
+
+});
diff --git a/tests/javascripts/errorTracking.test.js b/tests/javascripts/errorTracking.test.js
index 9b16b391f..c9db2aded 100644
--- a/tests/javascripts/errorTracking.test.js
+++ b/tests/javascripts/errorTracking.test.js
@@ -18,18 +18,23 @@ describe('Error tracking', () => {
afterEach(() => {
document.body.innerHTML = '';
+ delete window.GOVUK.analytics;
});
- test("It should send the right data to Google Analytics", () => {
+ test("If there is an analytics tracker set up, it should send details of the error to window.GOVUK.analytic", () => {
- window.ga = jest.fn(() => {});
+ window.GOVUK.analytics = {
+ 'trackEvent': jest.fn()
+ };
// start the module
window.GOVUK.modules.start();
- expect(window.ga).toHaveBeenCalled();
- expect(window.ga.mock.calls[0]).toEqual(['send', 'event', 'Error', 'validation', 'missing field']);
+ expect(window.GOVUK.analytics.trackEvent).toHaveBeenCalled();
+ expect(window.GOVUK.analytics.trackEvent.mock.calls[0]).toEqual(['Error', 'validation', {
+ 'label': 'missing field'
+ }]);
});
diff --git a/tests/javascripts/support/helpers.js b/tests/javascripts/support/helpers.js
index 90c253306..9135ed245 100644
--- a/tests/javascripts/support/helpers.js
+++ b/tests/javascripts/support/helpers.js
@@ -1,6 +1,7 @@
const globals = require('./helpers/globals.js');
const events = require('./helpers/events.js');
const domInterfaces = require('./helpers/dom_interfaces.js');
+const cookies = require('./helpers/cookies.js');
const html = require('./helpers/html.js');
const elements = require('./helpers/elements.js');
const rendering = require('./helpers/rendering.js');
@@ -14,6 +15,8 @@ exports.moveSelectionToRadio = events.moveSelectionToRadio;
exports.activateRadioWithSpace = events.activateRadioWithSpace;
exports.RangeMock = domInterfaces.RangeMock;
exports.SelectionMock = domInterfaces.SelectionMock;
+exports.deleteCookie = cookies.deleteCookie;
+exports.setCookie = cookies.setCookie;
exports.getRadioGroup = html.getRadioGroup;
exports.getRadios = html.getRadios;
exports.templatesAndFoldersCheckboxes = html.templatesAndFoldersCheckboxes;
diff --git a/tests/javascripts/support/helpers/cookies.js b/tests/javascripts/support/helpers/cookies.js
new file mode 100644
index 000000000..2ef2c0ebd
--- /dev/null
+++ b/tests/javascripts/support/helpers/cookies.js
@@ -0,0 +1,22 @@
+// Helper for deleting a cookie
+function deleteCookie (cookieName) {
+
+ document.cookie = cookieName + '=; path=/; expires=' + (new Date());
+
+};
+
+function setCookie (name, value, options) {
+ if (typeof options === 'undefined') {
+ options = {};
+ }
+ var cookieString = name + '=' + value + '; path=/;domain=' + window.location.hostname;
+ if (options.days) {
+ var date = new Date();
+ date.setTime(date.getTime() + (options.days * 24 * 60 * 60 * 1000));
+ cookieString = cookieString + '; expires=' + date.toGMTString();
+ }
+ document.cookie = cookieString;
+};
+
+exports.deleteCookie = deleteCookie;
+exports.setCookie = setCookie;
diff --git a/tests/javascripts/support/polyfills.js b/tests/javascripts/support/polyfills.js
new file mode 100644
index 000000000..0809eb763
--- /dev/null
+++ b/tests/javascripts/support/polyfills.js
@@ -0,0 +1,53 @@
+// Polyfills for any parts of the DOM API available in browsers but not JSDOM
+
+// From: https://gist.github.com/eligrey/1276030
+HTMLElement.prototype.insertAdjacentHTML = function(position, html) {
+ "use strict";
+
+ var
+ ref = this
+ , container = ref.ownerDocument.createElementNS("http://www.w3.org/1999/xhtml", "_")
+ , ref_parent = ref.parentNode
+ , node, first_child, next_sibling
+ ;
+
+ container.innerHTML = html;
+
+ switch (position.toLowerCase()) {
+ case "beforebegin":
+ while ((node = container.firstChild)) {
+ ref_parent.insertBefore(node, ref);
+ }
+ break;
+ case "afterbegin":
+ first_child = ref.firstChild;
+ while ((node = container.lastChild)) {
+ first_child = ref.insertBefore(node, first_child);
+ }
+ break;
+ case "beforeend":
+ while ((node = container.firstChild)) {
+ ref.appendChild(node);
+ }
+ break;
+ case "afterend":
+ next_sibling = ref.nextSibling;
+ while ((node = container.lastChild)) {
+ next_sibling = ref_parent.insertBefore(node, next_sibling);
+ }
+ break;
+ }
+
+};
+
+// from: https://developer.mozilla.org/en-US/docs/Web/API/Element/insertAdjacentText#Polyfill
+if (!Element.prototype.insertAdjacentText) {
+ Element.prototype.insertAdjacentText = function(type, txt){
+ this.insertAdjacentHTML(
+ type,
+ (txt+'') // convert to string
+ .replace(/&/g, '&') // embed ampersand symbols
+ .replace(/