From bba15f35b03eed27e24606b1532e4bae06678f0a Mon Sep 17 00:00:00 2001
From: Mike Monteith <mike@mikemonteith.com>
Date: Thu, 22 Oct 2020 16:03:00 +0100
Subject: [PATCH] Rearrange tests to assume text commenting is disabled by
 default

---
 ...sponse.html => enabled-text-response.html} |  2 +-
 tests/example/index.html                      |  2 +-
 tests/integration/answer-no.test.js           |  8 +++---
 tests/integration/answer-yes.test.js          |  6 +++--
 tests/integration/confirmation.test.js        |  3 +--
 .../integration/disable-text-response.test.js | 25 -------------------
 tests/integration/text-comments.test.js       |  4 ++-
 7 files changed, 15 insertions(+), 35 deletions(-)
 rename tests/example/{disabled-text-response.html => enabled-text-response.html} (93%)
 delete mode 100644 tests/integration/disable-text-response.test.js

diff --git a/tests/example/disabled-text-response.html b/tests/example/enabled-text-response.html
similarity index 93%
rename from tests/example/disabled-text-response.html
rename to tests/example/enabled-text-response.html
index 3d3229c..218deff 100644
--- a/tests/example/disabled-text-response.html
+++ b/tests/example/enabled-text-response.html
@@ -17,7 +17,7 @@
     <div class="nhsuk-width-container">
       <main class="nhsuk-main-wrapper">
         <h1>User feedback form:</h1>
-        <div id="nhsuk-user-feedback-form" data-form-endpoint="http://localhost:8080/my-endpoint/"></div>
+        <div id="nhsuk-user-feedback-form" data-form-endpoint="http://localhost:8080/my-endpoint/" data-enable-text-response></div>
 
         <!--
         If you have the user-feedback-store running locally and want to test it, the endpoint setting should probably be this:
diff --git a/tests/example/index.html b/tests/example/index.html
index 218deff..3d3229c 100644
--- a/tests/example/index.html
+++ b/tests/example/index.html
@@ -17,7 +17,7 @@
     <div class="nhsuk-width-container">
       <main class="nhsuk-main-wrapper">
         <h1>User feedback form:</h1>
-        <div id="nhsuk-user-feedback-form" data-form-endpoint="http://localhost:8080/my-endpoint/" data-enable-text-response></div>
+        <div id="nhsuk-user-feedback-form" data-form-endpoint="http://localhost:8080/my-endpoint/"></div>
 
         <!--
         If you have the user-feedback-store running locally and want to test it, the endpoint setting should probably be this:
diff --git a/tests/integration/answer-no.test.js b/tests/integration/answer-no.test.js
index fd69546..7986548 100644
--- a/tests/integration/answer-no.test.js
+++ b/tests/integration/answer-no.test.js
@@ -10,12 +10,14 @@ describe('Can answer no', () => {
     expect(noButton).not.toBe(null);
   });
 
-  it('should proceed to next question', async () => {
+  it('should proceed to confirmation page', async () => {
     const yesButton = await page.$('.nhsuk-user-feedback-form--no');
     await yesButton.click();
 
-    const labelText = await page.$eval('label', (element) => element.innerText);
-    expect(labelText).toBe('What were you looking for? (optional)');
+    const title = await page.$('h2');
+    expect(title).not.toBe(null);
+    const text = await page.evaluate((element) => element.innerText, title);
+    expect(text).toBe('Thank you for your feedback.');
   });
 
   it('should register a negative vote', async (done) => {
diff --git a/tests/integration/answer-yes.test.js b/tests/integration/answer-yes.test.js
index 77ee14d..6982f91 100644
--- a/tests/integration/answer-yes.test.js
+++ b/tests/integration/answer-yes.test.js
@@ -14,8 +14,10 @@ describe('Can answer yes', () => {
     const yesButton = await page.$('.nhsuk-user-feedback-form--yes');
     await yesButton.click();
 
-    const labelText = await page.$eval('label', (element) => element.innerText);
-    expect(labelText).toBe('What happened to make you visit the NHS website today? (optional)');
+    const title = await page.$('h2');
+    expect(title).not.toBe(null);
+    const text = await page.evaluate((element) => element.innerText, title);
+    expect(text).toBe('Thank you for your feedback.');
   });
 
   it('should register a positive vote', async (done) => {
diff --git a/tests/integration/confirmation.test.js b/tests/integration/confirmation.test.js
index 60fa577..fdeb5d2 100644
--- a/tests/integration/confirmation.test.js
+++ b/tests/integration/confirmation.test.js
@@ -3,7 +3,6 @@
 beforeEach(async () => {
   await page.goto('http://localhost:8080/tests/example/');
   await page.click('.nhsuk-user-feedback-form--yes');
-  await page.click('.nhsuk-user-feedback-form--submit');
 });
 
 describe('Confirmation text', () => {
@@ -20,6 +19,6 @@ describe('Confirmation text', () => {
     expect(message).not.toBe(null);
 
     const text = await page.evaluate((element) => element.innerText, message);
-    expect(text).toBe('We do not check feedback every day and cannot respond to comments.');
+    expect(text).toBe('Find out how to contact the NHS if you need to speak to someone.');
   });
 });
diff --git a/tests/integration/disable-text-response.test.js b/tests/integration/disable-text-response.test.js
deleted file mode 100644
index 0927208..0000000
--- a/tests/integration/disable-text-response.test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* global page expect */
-
-beforeEach(async () => {
-  await page.goto('http://localhost:8080/tests/example/disabled-text-response.html');
-  await page.click('.nhsuk-user-feedback-form--yes');
-});
-
-describe('Form is added to page', () => {
-  it('should display on page', async () => {
-    const banner = await page.$('.nhsuk-user-feedback-form');
-    expect(banner).not.toBe(null);
-  });
-});
-
-describe('Skip text response', () => {
-  it('should load the confirmation page straight away', async () => {
-    const title = await page.$eval('h2', (element) => element.innerText);
-    expect(title).toBe('Thank you for your feedback.');
-  });
-
-  it('should not have feedback message', async () => {
-    const message = await page.$eval('p', (element) => element.innerText);
-    expect(message).not.toBe('We do not check feedback every day and cannot respond to comments.');
-  });
-});
diff --git a/tests/integration/text-comments.test.js b/tests/integration/text-comments.test.js
index 561eb90..5c222c1 100644
--- a/tests/integration/text-comments.test.js
+++ b/tests/integration/text-comments.test.js
@@ -1,7 +1,9 @@
 /* global page expect */
 
 beforeEach(async () => {
-  await page.goto('http://localhost:8080/tests/example/');
+  // Text commenting is disabled at /tests/example/index.html,
+  // we need to use enabled-text-response.html instead.
+  await page.goto('http://localhost:8080/tests/example/enabled-text-response.html');
   await page.click('.nhsuk-user-feedback-form--yes');
 });