- Cookies are small files saved on your phone, tablet or computer when you visit a website. + GOV.UK Notify puts small files (known as ‘cookies’) + onto your computer.
-We use cookies to make GOV.UK Notify work and collect information about how you use our service.
- -These cookies are used to remember you once you’ve logged in.
- Essential cookies keep your information secure while you use Notify. We do not need to ask permission to use them. + Find out how to manage cookies. +
+ ++ We store session cookies on your computer to help keep your information + secure while you use the service.
| Name | @@ -42,43 +37,22 @@ notify_admin_session- Used to keep you signed in + Used to keep you logged in | 20 hours |
|---|---|---|
| - cookie_policy - | -- Saves your cookie consent settings - | -- 1 year - | -
- With your permission, we use Google Analytics to collect data about how you use Notify. This information helps us to improve our service. + 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.
-- Google is not allowed to use or share our analytics data with anyone. -
-- Google Analytics stores anonymised information about: -
-| Name | @@ -89,62 +63,18 @@||
|---|---|---|
| - _ga + seen_cookie_message | - Checks if you’ve visited Notify before. This helps us count how many people visit our site. + Saves a message to let us know that you have seen our cookie + message | - 2 years - | -
| - _gid - | -- Checks if you’ve visited Notify before. This helps us count how many people visit our site. - | -- 24 hours + 1 month |
We will retain your personal data for as long as you have a GOV.UK Notify account.
-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/gulpfile.js b/gulpfile.js index 52f713f2b..257aef277 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -142,11 +142,7 @@ 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', @@ -164,7 +160,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/app/main/views/test_code_not_received.py b/tests/app/main/views/test_code_not_received.py index 23712125e..c3f282c21 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.select('main p')[0].text + message = page.find_all('p')[1].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.select('main p')[0].text + message = page.find_all('p')[1].text assert message == expected assert page.find('form').input['value'] == api_user_pending['mobile_number'] diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py index 91c9f35a1..94c261aea 100644 --- a/tests/app/main/views/test_jobs.py +++ b/tests/app/main/views/test_jobs.py @@ -508,7 +508,7 @@ def test_should_show_scheduled_job( template_id='5d729fbd-239c-44ab-b498-75a985f3198f', version=1, ) - assert page.select_one('main button[type=submit]').text.strip() == 'Cancel sending' + assert page.select_one('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 54727061b..07f3ec1b6 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -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('main button[type=submit]')[0].text == "Save" + assert page.select('button[type=submit]')[0].text == "Save" def test_edit_user_email_page_404_for_non_team_member( @@ -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('main button[type=submit]')[0].text == "Save" + assert page.select('button[type=submit]')[0].text == "Save" def test_edit_user_mobile_number_redirects_to_confirmation( diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index c6ca1dedb..45e7217c7 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('main button[type=submit]').text.strip() == 'Send 1 text message' + assert page.select_one('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('main [type=submit]').text + page.select_one('[type=submit]').text ) == ( 'Send 1 letter' ) @@ -2259,7 +2259,7 @@ def test_send_button_is_correctly_labelled( ) assert normalize_spaces( - page.select_one('main [type=submit]').text + page.select_one('[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('main [type=submit]') + assert not page.select('[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('main [type=submit]') + assert not page.select('[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('main [type=submit]') + assert not page.select('[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 baa717df3..de9e6316f 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.select('main h2')[0].text == 'Your service is in trial mode' + assert page.find_all('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') @@ -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('main [type=submit]') + assert not page.select('[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('main form')) == 0 - assert len(page.select('main button')) == 0 + assert len(page.select('form')) == 0 + assert len(page.select('button')) == 1 @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 6874d4998..0e317fc15 100644 --- a/tests/app/main/views/test_template_folders.py +++ b/tests/app/main/views/test_template_folders.py @@ -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('main form')) == 2 - assert len(page.select('main button')) == 2 + assert len(page.select('form')) == 2 + assert len(page.select('button')) == 3 - assert 'action' not in page.select('main form')[0] - assert page.select('main form button')[0].text == 'Yes, delete' + assert 'action' not in page.select('form')[0] + assert page.select('form button')[0].text == 'Yes, delete' - assert page.select('main form')[1]['action'] == url_for( + assert page.select('form')[1]['action'] == url_for( 'main.manage_template_folder', service_id=service_one['id'], template_folder_id=folder_id, ) - assert page.select('main form button')[1].text == 'Save' + assert page.select('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 ed46f500e..e0263f945 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.select('main button[type=submit]')[0].text == 'Send 1 letter' + assert page.find('button', {'type': 'submit'}).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 len(page.select('main button[type=submit]')) == 0 + assert not page.find('button', {'type': 'submit'}) @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 f143d382a..47f7c7218 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.select('main p')[0].text + message = page.find_all('p')[1].text assert message == "We’ve sent you a text message with a security code." diff --git a/tests/javascripts/analytics/analytics.test.js b/tests/javascripts/analytics/analytics.test.js deleted file mode 100644 index 28d88d622..000000000 --- a/tests/javascripts/analytics/analytics.test.js +++ /dev/null @@ -1,127 +0,0 @@ -const helpers = require('../support/helpers'); - -beforeAll(() => { - - // add the script GA looks for in the document - document.body.appendChild(document.createElement('script')); - - require('../../../app/assets/javascripts/govuk/cookie-functions.js'); - require('../../../app/assets/javascripts/analytics/analytics.js'); - require('../../../app/assets/javascripts/analytics/init.js'); - -}); - -afterAll(() => { - - require('../support/teardown.js'); - -}); - -describe("Analytics", () => { - - let analytics; - - beforeEach(() => { - - window.ga = jest.fn(); - - analytics = new GOVUK.Analytics({ - trackingId: 'UA-75215134-1', - cookieDomain: 'auto', - anonymizeIp: true, - displayFeaturesTask: null, - transport: 'beacon', - name: 'GOVUK.analytics', - expires: 365 - }); - - }); - - afterEach(() => { - - window.ga.mockClear(); - - }); - - describe("When created", () => { - - test("It configures a tracker", () => { - - setUpArguments = window.ga.mock.calls; - - expect(setUpArguments[0]).toEqual(['create', 'UA-75215134-1', 'auto', 'GOVUK.analytics', { 'cookieExpires': 31536000 }]); - expect(setUpArguments[1]).toEqual(['set', 'anonymizeIp', true]); - expect(setUpArguments[2]).toEqual(['set', 'displayFeaturesTask', null]); - expect(setUpArguments[3]).toEqual(['set', 'transport', 'beacon']); - - }); - - }); - - describe("When tracking pageviews", () => { - - beforeEach(() => { - - // clear calls to window.ga from set up - window.ga.mockClear(); - - }); - - test("It sends the right URL for the page if no arguments", () => { - - jest.spyOn(window, 'location', 'get').mockImplementation(() => { - return { - 'pathname': '/privacy', - 'search': '' - }; - }); - - analytics.trackPageview(); - - expect(window.ga.mock.calls[0]).toEqual(['send', 'pageview', '/privacy']); - - }); - - test("It strips the UUIDs from URLs", () => { - - jest.spyOn(window, 'location', 'get').mockImplementation(() => { - return { - 'pathname': '/services/6658542f-0cad-491f-bec8-ab8457700ead', - 'search': '' - }; - }); - - analytics.trackPageview(); - - expect(window.ga.mock.calls[0]).toEqual(['send', 'pageview', '/services/…']); - - }); - - }); - - describe("When tracking events", () => { - - beforeEach(() => { - - // clear calls to window.ga from set up - window.ga.mockClear(); - - }); - - test("It sends the right arguments to `ga`", () => { - - analytics.trackEvent('Error', 'Enter a valid email address', { - 'label': 'email_address' - }); - - expect(window.ga.mock.calls[0]).toEqual(['send', 'event', { - 'eventCategory': 'Error', - 'eventAction': 'Enter a valid email address', - 'eventLabel': 'email_address' - }]); - - }); - - }); - -}); diff --git a/tests/javascripts/analytics/init.test.js b/tests/javascripts/analytics/init.test.js deleted file mode 100644 index 8384b826f..000000000 --- a/tests/javascripts/analytics/init.test.js +++ /dev/null @@ -1,123 +0,0 @@ -const helpers = require('../support/helpers'); - -beforeAll(() => { - - // add the script GA looks for in the document - document.body.appendChild(document.createElement('script')); - - require('../../../app/assets/javascripts/govuk/cookie-functions.js'); - require('../../../app/assets/javascripts/analytics/analytics.js'); - require('../../../app/assets/javascripts/analytics/init.js'); - -}); - -afterAll(() => { - - require('../support/teardown.js'); - -}); - -describe("Analytics init", () => { - - beforeAll(() => { - - window.ga = jest.fn(); - jest.spyOn(window.GOVUK.Analytics, 'load'); - - // pretend we're on the /privacy page - jest.spyOn(window, 'location', 'get').mockImplementation(() => { - return { - 'pathname': '/privacy', - 'search': '' - }; - }); - - }); - - afterEach(() => { - - window.GOVUK.Analytics.load.mockClear(); - window.ga.mockClear(); - - }); - - test("After the init.js script has been loaded, Google Analytics will be disabled", () => { - - expect(window['ga-disable-UA-75215134-1']).toBe(true); - - }); - - describe("If initAnalytics has already been called", () => { - - beforeAll(() => { - - // Fake a tracker instance - window.GOVUK.analytics = {}; - - }); - - beforeEach(() => { - - window.GOVUK.initAnalytics(); - - }); - - afterAll(() => { - - delete window.GOVUK.analytics; - - }); - - test("The Google Analytics libraries will not be loaded", () => { - - expect(window.GOVUK.Analytics.load).not.toHaveBeenCalled(); - - }); - - }); - - describe("If initAnalytics has not been called", () => { - - beforeEach(() => { - - window.GOVUK.initAnalytics(); - - }); - - afterEach(() => { - - // window.GOVUK.initAnalytics sets up a new window.GOVUK.analytics which needs clearing - delete window.GOVUK.analytics; - - }); - - test("Google Analytics will not be disabled", () => { - - expect(window['ga-disable-UA-75215134-1']).toBe(false); - - }); - - test("The Google Analytics libraries will have been loaded", () => { - - expect(window.GOVUK.Analytics.load).toHaveBeenCalled(); - - }); - - test("There will be an interface with the Google Analytics API", () => { - - expect(window.GOVUK.analytics).toBeDefined(); - - }); - - test("A pageview will be registered", () => { - - expect(window.ga.mock.calls.length).toEqual(5); - - // The first 4 calls configure the analytics tracker. All subsequent calls send data - expect(window.ga.mock.calls[4]).toEqual(['send', 'pageview', '/privacy']); - - }); - - }); - -}); diff --git a/tests/javascripts/consent.test.js b/tests/javascripts/consent.test.js deleted file mode 100644 index 9217bd81c..000000000 --- a/tests/javascripts/consent.test.js +++ /dev/null @@ -1,55 +0,0 @@ -const helpers = require('./support/helpers'); - -beforeAll(() => { - - require('../../app/assets/javascripts/govuk/cookie-functions.js'); - require('../../app/assets/javascripts/consent.js'); - -}); - -afterAll(() => { - - require('./support/teardown.js'); - -}); - -describe("Cookie consent", () => { - - describe("hasConsentFor", () => { - - afterEach(() => { - - // remove cookie set by tests - helpers.deleteCookie('cookies_policy'); - - }); - - test("If there is no consent cookie, return false", () => { - - expect(window.GOVUK.hasConsentFor('analytics')).toBe(false); - - }); - - describe("If a consent cookie is set", () => { - - test("If the category is not saved in the cookie, return false", () => { - - window.GOVUK.setConsentCookie({ 'usage': true }); - - expect(window.GOVUK.hasConsentFor('analytics')).toBe(false); - - }); - - test("If the category is saved in the cookie, return its value", () => { - - window.GOVUK.setConsentCookie({ 'analytics': true }); - - expect(window.GOVUK.hasConsentFor('analytics')).toBe(true); - - }); - - }); - - }); - -}); diff --git a/tests/javascripts/cookieMessage.test.js b/tests/javascripts/cookieMessage.test.js deleted file mode 100644 index 1d5b47154..000000000 --- a/tests/javascripts/cookieMessage.test.js +++ /dev/null @@ -1,237 +0,0 @@ -const helpers = require('./support/helpers'); - -beforeAll(() => { - - require('../../app/assets/javascripts/govuk/cookie-functions.js'); - require('../../app/assets/javascripts/analytics/analytics.js'); - require('../../app/assets/javascripts/analytics/init.js'); - require('../../app/assets/javascripts/cookieMessage.js'); - -}); - -afterAll(() => { - - require('./support/teardown.js'); - -}); - -describe("Cookie message", () => { - - let cookieMessage; - - beforeAll(() => { - - const cookieMessageStyles = document.createElement('style'); - - // add the CSS that hides the cookie message by default - cookieMessageStyles.textContent = '.notify-cookie-banner { display: none; }'; - document.getElementsByTagName('head')[0].appendChild(cookieMessageStyles); - - // protect against any previous tests setting a cookies-policy cookie - helpers.deleteCookie('cookies-policy'); - - }); - - beforeEach(() => { - - // add the script GA looks for in the document - document.body.appendChild(document.createElement('script')); - - jest.spyOn(window.GOVUK, 'initAnalytics'); - - cookieMessage = ` - `; - - document.body.innerHTML += cookieMessage; - - }); - - afterEach(() => { - - document.body.innerHTML = ''; - - // remove cookie set by tests - helpers.deleteCookie('cookies_policy'); - - // reset spies - 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 cookie banner is hidden. - - This works through CSS, based on the presence of the `js-enabled` class on the so is not tested here. - */ - - test("If the cookies set by the old banner still exist, they can be cleared with the `clearOldCookies` method", () => { - - helpers.setCookie('seen_cookie_message', 'true', { 'days': 365 }); - helpers.setCookie('_ga', 'GA1.1.123.123', { 'days': 365 }); - helpers.setCookie('_gid', 'GA1.1.456.456', { 'days': 1 }); - - window.GOVUK.Modules.CookieBanner.clearOldCookies(); - - expect(window.GOVUK.cookie('seen_cookie_message')).toBeNull(); - expect(window.GOVUK.cookie('_ga')).toBeNull(); - expect(window.GOVUK.cookie('_gid')).toBeNull(); - - }); - - test("If user has made a choice to give their consent or not, the cookie banner should be hidden", () => { - - window.GOVUK.setConsentCookie({ 'analytics': false }); - - window.GOVUK.modules.start() - - expect(helpers.element(document.querySelector('.notify-cookie-banner')).is('hidden')).toBe(true); - - }); - - describe("If user hasn't made a choice to give their consent or not", () => { - - beforeEach(() => { - - window.GOVUK.modules.start(); - - }); - - test("The cookie banner should show", () => { - - const banner = helpers.element(document.querySelector('.notify-cookie-banner')); - - expect(banner.is('hidden')).toBe(false); - - }); - - test("No analytics should run", () => { - - expect(window.GOVUK.initAnalytics).not.toHaveBeenCalled(); - - }); - - describe("If the user clicks the button to accept analytics", () => { - - beforeEach(() => { - - const acceptButton = document.querySelector('.notify-cookie-banner__button-accept button'); - - helpers.triggerEvent(acceptButton, 'click'); - - }); - - test("the banner should confirm your choice and link to the cookies page as a way to change your mind", () => { - - confirmation = helpers.element(document.querySelector('.notify-cookie-banner__confirmation')); - - expect(confirmation.is('hidden')).toBe(false); - expect(confirmation.el.textContent.trim()).toEqual(expect.stringMatching(/^You’ve accepted analytics cookies/)); - - }); - - test("If the user clicks the 'hide' button, the banner should be hidden", () => { - - const hideButton = document.querySelector('.notify-cookie-banner__hide-button'); - const banner = helpers.element(document.querySelector('.notify-cookie-banner')); - - helpers.triggerEvent(hideButton, 'click'); - - expect(banner.is('hidden')).toBe(true); - - }); - - test("The consent cookie should be set, with analytics set to 'true'", () => { - - expect(window.GOVUK.getConsentCookie()).toEqual({ 'analytics': true }); - - }); - - test("The analytics should be set up", () => { - - expect(window.GOVUK.analytics).toBeDefined(); - - }); - - }); - - describe("If the user clicks the button to reject analytics", () => { - - beforeEach(() => { - - const rejectButton = document.querySelector('.notify-cookie-banner__button-reject button'); - - helpers.triggerEvent(rejectButton, 'click'); - - }); - - test("the banner should confirm your choice and link to the cookies page as a way to change your mind", () => { - - confirmation = helpers.element(document.querySelector('.notify-cookie-banner__confirmation')); - - expect(confirmation.is('hidden')).toBe(false); - expect(confirmation.el.textContent.trim()).toEqual(expect.stringMatching(/^You told us not to use analytics cookies/)); - - }); - - test("If the user clicks the 'hide' button, the banner should be hidden", () => { - - const hideButton = document.querySelector('.notify-cookie-banner__hide-button'); - const banner = helpers.element(document.querySelector('.notify-cookie-banner')); - - helpers.triggerEvent(hideButton, 'click'); - - expect(banner.is('hidden')).toBe(true); - - }); - - test("The consent cookie should be set, with analytics set to 'false'", () => { - - expect(window.GOVUK.getConsentCookie()).toEqual({ 'analytics': false }); - - }); - - test("The analytics should not be set up", () => { - - expect(window.GOVUK.analytics).not.toBeDefined(); - - }); - - }); - - }); - -}); diff --git a/tests/javascripts/cookieSettings.test.js b/tests/javascripts/cookieSettings.test.js deleted file mode 100644 index a6c6f1344..000000000 --- a/tests/javascripts/cookieSettings.test.js +++ /dev/null @@ -1,255 +0,0 @@ -const helpers = require('./support/helpers'); - -beforeAll(() => { - - require('../../app/assets/javascripts/govuk/cookie-functions.js'); - require('../../app/assets/javascripts/consent.js'); - require('../../app/assets/javascripts/analytics/analytics.js'); - require('../../app/assets/javascripts/analytics/init.js'); - require('../../app/assets/javascripts/cookieSettings.js'); - -}); - -afterAll(() => { - - require('./support/teardown.js'); - -}); - -describe("Cookie settings", () => { - - let cookiesPageContent; - let yesRadio; - let noRadio; - let saveButton; - - beforeEach(() => { - - // add the script GA looks for in the document - document.body.appendChild(document.createElement('script')); - - window.ga = jest.fn(); - jest.spyOn(window.GOVUK, 'initAnalytics'); - - cookiesPageContent = ` - -- 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.
- -