+ <% unless clashing_sections.empty? %>
+ <%= render "govuk_publishing_components/components/warning_text", {
+ text: "Warning: There are duplicate section slugs in this manual."
+ } %>
+ <% clashing_sections_list = clashing_sections.map do |slug, sections|; slug; end %>
+ <%= render "govuk_publishing_components/components/list", {
+ visible_counters: true,
+ items: clashing_sections_list
+ } %>
+ <% end %>
-
-
Summary
-
<%= manual.summary %>
-
+
- <% if manual.body.present? %>
-
-
Body
-
<%= manual.body %>
-
- <% end %>
+
+ <%= render "shared/summary_card_component", {
+ title: "About this manual",
+ summary_card_actions: [
+ {
+ label: "Edit first publication date",
+ href: original_publication_date_manual_path(manual)
+ },
+ ],
+ rows: manual_metadata_rows(manual),
+ } %>
+
-
-
Metadata
-
- - State
- - <%= state(manual) %>
-
- <% if manual.publish_tasks.any? %>
-
- - Last published
- - <%= publication_task_state(manual.publish_tasks.first) %>
-
- <% end %>
- <% if current_user_is_gds_editor? %>
-
- - From
- - <%= link_to manual.organisation_slug, url_for_public_org(manual.organisation_slug) %>
-
- <% end %>
- <% if manual.originally_published_at.present? %>
-
- - Originally published
- - <%= nice_time_format(manual.originally_published_at) %><% if manual.use_originally_published_at_for_public_timestamp? %>
This will be used as the public updated at timestamp on GOV.UK.<% end %>
-
- <% end %>
-
+ <% if show_preview?(manual) %>
+
+ Preview
+
+ <%= link_to "Preview on website (opens in new tab)", content_preview_url(manual), target: "_blank" %>
+
+ <% end %>
+
+
+ <%= render "shared/summary_card_component", {
+ title: "Front page",
+ summary_card_actions: [
+ {
+ label: "Edit",
+ href: edit_manual_path(manual)
+ }
+ ],
+ rows: manual_front_page_rows(manual),
+ } %>
+
-
-
Sections
-
- <%= link_to 'Reorder sections', reorder_manual_sections_path(manual), class: 'btn btn-default add-right-margin' %>
- <%= link_to 'Add section', new_manual_section_path(manual), class: 'btn btn-default' %>
-
- <% if manual.sections.any? %>
-
- <% manual.sections.each do |section| %>
- -
- <% if section.state == "draft" %>
- draft
- <% end %>
- <%= link_to(section.title, manual_section_path(manual, section), class: 'document-title') %>
-
+
+ <%= render "shared/summary_card_component", {
+ title: "Sections",
+ summary_card_actions: [
+ {
+ label: "Reorder sections",
+ href: reorder_manual_sections_path(manual)
+ },
+ {
+ label: "Add section",
+ href: new_manual_section_path(manual)
+ },
+ ],
+ rows: manual_section_rows(manual),
+ } %>
+
+
+
+
+ <% if allow_publish?(manual, slug_unique) || !manual.has_ever_been_published? %>
+
-
+ <% end %>
- <% unless manual.has_ever_been_published? %>
-
-
Discard draft manual
-
- <%= link_to 'Discard draft', confirm_discard_manual_path(manual), class: 'btn btn-danger' %>
-
+ <% if manual.published? %>
+
<% end %>
-
-
- <%= render "admin/legacy_link_check_reports/link_check_report", reportable: { manual_id: manual.to_param }, report: manual.link_check_report %>
+ <%= render "admin/link_check_reports/link_check_report", reportable: { manual_id: manual.to_param }, report: manual.link_check_report %>
+
+ <% if manual.draft? && manual.has_ever_been_published? %>
+
+
This is a new draft of a document that has already been published.
+
+ <%= link_to "Go to published edition", url_for_public_manual(manual), target: "_blank", class: "govuk-link" %>
+
+ <% end %>
diff --git a/app/views/shared/_summary_card_component.html.erb b/app/views/shared/_summary_card_component.html.erb
new file mode 100644
index 000000000..8ba838f82
--- /dev/null
+++ b/app/views/shared/_summary_card_component.html.erb
@@ -0,0 +1,41 @@
+<%
+ id ||= nil
+ data_attributes ||= {}
+ summary_card_actions ||= []
+ rows ||=[]
+%>
+<%= tag.div class: "app-c-summary-card-component", id: id, data: data_attributes do %>
+
+
+
<%= title %>
+
+ <% summary_card_actions.each do |action| %>
+ -
+ <%= link_to sanitize(action[:label] + tag.span(" #{title}", class: "govuk-visually-hidden")), action[:href], class: "govuk-link govuk-link--no-visited-state #{"gem-link--destructive govuk-!-font-weight-bold" if action[:destructive]}".strip %>
+
+ <% end %>
+
+
+
+
+ <% rows.each do |row| %>
+
+
- <%= row[:key] %>
+ - <%= row[:value] %>
+ <% if row[:actions].present? %>
+ -
+ <% row[:actions].each do |action| %>
+ <% if action[:opens_in_new_tab] %>
+ <%= link_to sanitize(action[:label] + tag.span(" #{row[:key]} (opens in new tab)", class: "govuk-visually-hidden")), action[:href], class: "govuk-link govuk-link--no-visited-state govuk-!-margin-left-2", rel: "noreferrer noopener", target: "_blank" %>
+ <% else %>
+ <%= link_to sanitize(action[:label] + tag.span(" #{row[:key]}", class: "govuk-visually-hidden")), action[:href], class: "govuk-link govuk-link--no-visited-state govuk-!-margin-left-2 #{"gem-link--destructive" if action[:destructive]}".strip %>
+ <% end %>
+ <% end %>
+
+ <% end %>
+
+ <% end %>
+
+
+
+<% end %>
diff --git a/features/step_definitions/manual_steps.rb b/features/step_definitions/manual_steps.rb
index 08e1ef379..a901b0229 100644
--- a/features/step_definitions/manual_steps.rb
+++ b/features/step_definitions/manual_steps.rb
@@ -301,8 +301,8 @@
When(/^I click the publish manual button$/) do
go_to_manual_page(@manual.title) if current_path != manual_path(@manual)
- expect(page).to have_link("Publish manual", href: confirm_publish_manual_path(@manual))
- click_on "Publish manual"
+ expect(page).to have_link("Publish", href: confirm_publish_manual_path(@manual))
+ click_on "Publish"
end
Then(/^I am asked to confirm the publishing of a section titled "(.*?)"$/) do |section_title|
@@ -590,7 +590,7 @@
Then(/^I can see the change note and update type form when editing existing sections$/) do
@sections.each do |section|
go_to_manual_page(@manual.title)
- click_on section.title
+ click_link section.title, href: manual_section_path(@manual, section)
click_on "Edit section"
check_that_change_note_fields_are_present
@@ -778,7 +778,7 @@
Then(/^the order of the sections in the manual should have been updated$/) do
@reordered_section_attributes.map { |sec| sec[:title] }.each.with_index do |title, index|
- expect(page).to have_css(".document-list li.document:nth-child(#{index + 1}) .document-title", text: title)
+ expect(page).to have_css(".govuk-summary-list .govuk-summary-list__row:nth-child(#{index + 1}) dt.govuk-summary-list__key", text: title)
end
end
@@ -812,5 +812,5 @@
click_on @manual.title
- expect(page).to have_selector(:xpath, "//dt[.='State']/following-sibling::dd[.='#{status}']")
+ expect(page).to have_selector(:xpath, "//dt[.='Status']/following-sibling::dd[.='#{status}']")
end
diff --git a/features/support/manual_helpers.rb b/features/support/manual_helpers.rb
index 980bbfebb..70f7ff847 100644
--- a/features/support/manual_helpers.rb
+++ b/features/support/manual_helpers.rb
@@ -91,7 +91,9 @@ def edit_manual_without_ui(manual, fields, organisation_slug: "ministry-of-tea")
def edit_section(manual_title, section_title, new_fields)
go_to_manual_page(manual_title)
- click_on section_title
+ within(:xpath, "//div[dt[span[.='#{section_title}']]]") do
+ click_on("View")
+ end
click_on "Edit"
fill_in_fields(new_fields)
@@ -148,7 +150,7 @@ def save_as_draft
end
def publish_manual
- click_on "Publish manual"
+ click_on "Publish"
page.should have_button("Publish")
click_on "Publish"
end
@@ -202,7 +204,7 @@ def check_section_was_removed(manual_id, section_uuid)
def go_to_edit_page_for_manual(manual_title)
go_to_manual_page(manual_title)
- click_on("Edit manual")
+ click_on("Front page")
end
def check_for_errors_for_fields(field)
@@ -211,7 +213,7 @@ def check_for_errors_for_fields(field)
def check_content_preview_link(slug)
preview_url = "#{Plek.external_url_for('draft-origin')}/#{slug}"
- expect(page).to have_link("Preview draft", href: preview_url)
+ expect(page).to have_link("Preview on website (opens in new tab)", href: preview_url)
end
def check_live_link(slug)
diff --git a/spec/features/manual_urls_spec.rb b/spec/features/manual_urls_spec.rb
index fa05226c6..a4776e574 100644
--- a/spec/features/manual_urls_spec.rb
+++ b/spec/features/manual_urls_spec.rb
@@ -15,7 +15,7 @@
click_on "A manual"
- expect(page).to have_link("Edit manual", href: %r{/manuals/#{manual.id}/edit$})
+ expect(page).to have_link("Edit", href: %r{/manuals/#{manual.id}/edit$})
expect(page).to have_link("Section 1", href: %r{/manuals/#{manual.id}/sections/#{section.uuid}$})
click_on "Section 1"
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index aba02d4d8..cacd74850 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -92,4 +92,271 @@ def current_user_can_publish? = false
end
end
end
+
+ describe "#state_label" do
+ it "returns a span with general tag classes" do
+ manual = FactoryBot.build_stubbed(:manual)
+
+ result = state_label(manual)
+
+ expect(result).to include("govuk-tag govuk-tag--s")
+ end
+
+ context "when manual is in draft state and has been published" do
+ let(:manual) { FactoryBot.build_stubbed(:manual, state: "draft", ever_been_published: true) }
+
+ it "returns a span with blue class" do
+ result = state_label(manual)
+
+ expect(result).to include("govuk-tag--blue")
+ end
+
+ it "appends text to publication state text" do
+ result = state_label(manual)
+
+ expect(result).to include("published with new draft")
+ end
+ end
+
+ context "when manual is in draft state and has never been published" do
+ let(:manual) { FactoryBot.build_stubbed(:manual, state: "draft", ever_been_published: false) }
+
+ it "returns a span with blue class" do
+ result = state_label(manual)
+
+ expect(result).to include("govuk-tag--blue")
+ end
+ end
+
+ context "when manual is in published state" do
+ let(:manual) { FactoryBot.build_stubbed(:manual, state: "published") }
+
+ it "returns a span with green class for an unedited published manual" do
+ result = state_label(manual)
+
+ expect(result).to include("govuk-tag--green")
+ end
+ end
+
+ context "when manual is in withdrawn state" do
+ let(:manual) { FactoryBot.build_stubbed(:manual, state: "withdrawn") }
+
+ it "returns a span with grey class for an unedited published manual" do
+ result = state_label(manual)
+
+ expect(result).to include("govuk-tag--grey")
+ end
+ end
+ end
+
+ describe "#manual_metadata_rows" do
+ before do
+ allow_any_instance_of(ApplicationHelper).to receive(:current_user_is_gds_editor?).and_return(false)
+ end
+
+ it "returns a 'status' row" do
+ manual = FactoryBot.build_stubbed(:manual)
+ allow_any_instance_of(ApplicationHelper).to receive(:state_label).and_return("state_label")
+ manual.publish_tasks = []
+
+ rows = manual_metadata_rows(manual)
+
+ expect(rows).to include(
+ { key: "Status", value: "state_label" },
+ )
+ end
+
+ it "returns a 'from' row when the current user is a gds editor" do
+ organisation_slug = "Organisational slug"
+ manual = FactoryBot.build_stubbed(:manual, organisation_slug:)
+ allow_any_instance_of(ApplicationHelper).to receive(:current_user_is_gds_editor?).and_return(true)
+ allow_any_instance_of(ApplicationHelper).to receive(:url_for_public_org).and_return("government/organisation_slug")
+ manual.publish_tasks = []
+
+ rows = manual_metadata_rows(manual)
+
+ expect(rows).to include(
+ { key: "From", value: link_to(manual.organisation_slug, "government/organisation_slug") },
+ )
+ end
+
+ it "does not return a 'from' row when the current user is not a gds editor" do
+ organisation_slug = "Organisational slug"
+ manual = FactoryBot.build_stubbed(:manual, organisation_slug:)
+ allow_any_instance_of(ApplicationHelper).to receive(:current_user_is_gds_editor?).and_return(false)
+ manual.publish_tasks = []
+
+ rows = manual_metadata_rows(manual)
+
+ expect(rows).not_to include(include(key: "From"))
+ end
+
+ it "returns an 'originally published' row when the manual has an original publication date" do
+ manual = FactoryBot.build_stubbed(:manual, originally_published_at: Time.zone.now)
+ allow_any_instance_of(ApplicationHelper).to receive(:nice_time_format).and_return("nice time format")
+ allow_any_instance_of(ApplicationHelper).to receive(:original_publication_date_manual_path).and_return("original publication date path")
+ manual.publish_tasks = []
+
+ rows = manual_metadata_rows(manual)
+
+ expect(rows).to include(
+ { key: "Originally published",
+ value: "nice time format" },
+ )
+ end
+
+ it "does not return an 'originally published' row when the manual does not have an original publication date" do
+ manual = FactoryBot.build_stubbed(:manual)
+ manual.publish_tasks = []
+
+ rows = manual_metadata_rows(manual)
+
+ expect(rows).not_to include(include(key: "Originally published"))
+ end
+
+ it "returns a 'last published' row when the manual has publish tasks" do
+ manual = FactoryBot.build_stubbed(:manual)
+ allow_any_instance_of(ApplicationHelper).to receive(:publication_task_state).and_return("test publication task state")
+ manual.publish_tasks = [{ updated_at: Time.zone.now, state: "queued" }]
+
+ rows = manual_metadata_rows(manual)
+
+ expect(rows).to include(
+ { key: "Last published",
+ value: "test publication task state" },
+ )
+ end
+
+ it "does not return an 'last published' row when the manual does not have publish tasks" do
+ manual = FactoryBot.build_stubbed(:manual)
+ manual.publish_tasks = []
+
+ rows = manual_metadata_rows(manual)
+
+ expect(rows).not_to include(include(key: "Last published"))
+ end
+ end
+
+ describe "#manual_front_page_rows" do
+ it "returns rows for slug, title, and summary" do
+ slug = "/test-slug"
+ title = "test title"
+ summary = "test summary"
+ manual = FactoryBot.build_stubbed(:manual, slug:, title:, summary:)
+
+ rows = manual_front_page_rows(manual)
+
+ expect(rows).to include(
+ { key: "Slug", value: slug },
+ { key: "Title", value: title },
+ { key: "Summary", value: summary },
+ )
+ end
+
+ it "returns a simple-formatted row for the body when it is not empty" do
+ manual = FactoryBot.build_stubbed(:manual, body: "a manual body")
+
+ rows = manual_front_page_rows(manual)
+
+ expect(rows).to include(
+ { key: "Body", value: "
a manual body
" },
+ )
+ end
+
+ it "does not return a row for the body when it is empty" do
+ manual = FactoryBot.build_stubbed(:manual, body: "")
+
+ rows = manual_front_page_rows(manual)
+
+ expect(rows).to_not include(include(key: "Body"))
+ end
+ end
+
+ describe "#manual_sidebar_action_items" do
+ before do
+ allow_any_instance_of(ApplicationHelper).to receive(:allow_publish?).and_return(true)
+ end
+
+ it "returns a 'publish' button when the manual is allowed to be published" do
+ manual = FactoryBot.build_stubbed(:manual)
+ confirm_publish_path = "/manual/blah/confirm_publish"
+ allow_any_instance_of(ApplicationHelper).to receive(:allow_publish?).and_return(true)
+ allow_any_instance_of(ApplicationHelper).to receive(:confirm_publish_manual_path).and_return(confirm_publish_path)
+
+ items = manual_sidebar_action_items(manual, true)
+
+ expect(items).to include(include("Publish"))
+ expect(items).to include(include(confirm_publish_path))
+ end
+
+ it "does not return a 'publish' button when the manual is not allowed to be published" do
+ manual = FactoryBot.build_stubbed(:manual)
+ allow_any_instance_of(ApplicationHelper).to receive(:allow_publish?).and_return(false)
+
+ items = manual_sidebar_action_items(manual, true)
+
+ expect(items).not_to include(include("Publish"))
+ end
+
+ it "returns a 'discard' button when the manual has never been published" do
+ manual = FactoryBot.build_stubbed(:manual, ever_been_published: false)
+
+ items = manual_sidebar_action_items(manual, true)
+
+ expect(items).to include(include("Discard"))
+ end
+
+ it "does not return a 'discard' button when the manual has been published" do
+ manual = FactoryBot.build_stubbed(:manual, ever_been_published: true)
+
+ items = manual_sidebar_action_items(manual, true)
+
+ expect(items).not_to include(include("Discard"))
+ end
+ end
+
+ describe "#manual_section_rows" do
+ before do
+ allow_any_instance_of(ApplicationHelper).to receive(:last_updated_text).and_return("")
+ end
+
+ it "returns a row for each section in the manual" do
+ manual = FactoryBot.build_stubbed(:manual)
+ manual.build_section({})
+ manual.build_section({})
+
+ rows = manual_section_rows(manual)
+
+ expect(rows.length).to be(2)
+ end
+
+ it "adds a 'DRAFT' tag to the key when the section is in the 'draft' state" do
+ manual = FactoryBot.build_stubbed(:manual)
+ manual.build_section({ state: "draft", title: "test title" })
+
+ rows = manual_section_rows(manual)
+
+ expect(rows).to include(include(key: include(">DRAFT")))
+ expect(rows).to include(include(key: include(">test title")))
+ end
+
+ it "does not add a 'DRAFT' tag to the key when the section is in the 'published' state" do
+ manual = FactoryBot.build_stubbed(:manual)
+ manual.build_section({ state: "published", title: "test title" })
+
+ rows = manual_section_rows(manual)
+
+ expect(rows).not_to include(include(key: include(">DRAFT")))
+ expect(rows).to include(include(key: include(">test title")))
+ end
+
+ it "uses the section's title for the key when the section is in the 'published state" do
+ manual = FactoryBot.build_stubbed(:manual)
+ manual.build_section({ state: "published", title: "test title" })
+
+ rows = manual_section_rows(manual)
+
+ expect(rows).to include(include(key: "
test title"))
+ end
+ end
end
diff --git a/spec/views/admin/link_check_reports/_form.html.erb_spec.rb b/spec/views/admin/link_check_reports/_form.html.erb_spec.rb
new file mode 100644
index 000000000..c6c584147
--- /dev/null
+++ b/spec/views/admin/link_check_reports/_form.html.erb_spec.rb
@@ -0,0 +1,12 @@
+require "spec_helper"
+
+describe "admin/link_check_reports/_form", type: :view do
+ it "renders a button with the specified text" do
+ allow(view).to receive(:reportable).and_return({})
+ allow(view).to receive(:button_text).and_return("Do the thing")
+
+ render
+
+ expect(rendered).to have_css("button", exact_text: "Do the thing")
+ end
+end
diff --git a/spec/views/manuals/show.html.erb_spec.rb b/spec/views/manuals/show.html.erb_spec.rb
index c35a8c597..9923e41c5 100644
--- a/spec/views/manuals/show.html.erb_spec.rb
+++ b/spec/views/manuals/show.html.erb_spec.rb
@@ -23,4 +23,25 @@
expect(rendered).to match(/Discard draft/)
end
+
+ [
+ [:notice, ".govuk-notification-banner .govuk-notification-banner__content"],
+ [:success, ".govuk-notification-banner .govuk-notification-banner__content"],
+ [:error, ".gem-c-error-alert .gem-c-error-alert__message"],
+ ].each do |flash_type, msg_css_selector|
+ it "renders a #{flash_type} flash message" do
+ manual = FactoryBot.build_stubbed(:manual)
+ manual.publish_tasks = []
+ msg = "A flash message"
+ flash[flash_type] = msg
+ allow(view).to receive(:flash).and_return(flash)
+ allow(view).to receive(:current_user).and_return(FactoryBot.build_stubbed(:user))
+
+ render template: "manuals/show",
+ layout: "layouts/design_system",
+ locals: { manual:, slug_unique: true, clashing_sections: [] }
+
+ expect(rendered).to have_css(msg_css_selector, text: msg)
+ end
+ end
end
From a6d412ca754b0d0accee089d8d59406d8fad1c95 Mon Sep 17 00:00:00 2001
From: Mark Taylor <138604938+mtaylorgds@users.noreply.github.com>
Date: Thu, 7 Sep 2023 09:25:24 +0100
Subject: [PATCH 4/5] Replace heading tag elements
Replace HTML tag elements with use of the `heading` component from the
design system. Visually they should appear the same.
---
app/assets/stylesheets/application.scss | 1 +
app/views/manuals/show.html.erb | 14 ++++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index d7ec13d2c..6e5f0ed9f 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -8,6 +8,7 @@ $govuk-page-width: 1140px;
@import "govuk_publishing_components/components/details";
@import "govuk_publishing_components/components/error-alert";
@import "govuk_publishing_components/components/error-message";
+@import "govuk_publishing_components/components/heading";
@import "govuk_publishing_components/components/hint";
@import "govuk_publishing_components/components/input";
@import "govuk_publishing_components/components/label";
diff --git a/app/views/manuals/show.html.erb b/app/views/manuals/show.html.erb
index a4197d275..25ed621c9 100644
--- a/app/views/manuals/show.html.erb
+++ b/app/views/manuals/show.html.erb
@@ -18,7 +18,12 @@
-
<%= manual.title %>
+ <%= render "govuk_publishing_components/components/heading", {
+ text: manual.title,
+ heading_level: 1,
+ font_size: "xl",
+ margin_bottom: 8
+ } %>
@@ -51,7 +56,12 @@
<% if show_preview?(manual) %>
- Preview
+ <%= render "govuk_publishing_components/components/heading", {
+ text: "Preview",
+ heading_level: 2,
+ font_size: "l",
+ margin_bottom: 6
+ } %>
<%= link_to "Preview on website (opens in new tab)", content_preview_url(manual), target: "_blank" %>
From a86634d81ed9604b40790c8da7a3adc8ca073d28 Mon Sep 17 00:00:00 2001
From: Mark Taylor <138604938+mtaylorgds@users.noreply.github.com>
Date: Thu, 7 Sep 2023 16:04:35 +0100
Subject: [PATCH 5/5] Update section summary card actions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Update the actions labels for the Sections summary card to make the text
clearer for screen readers. The summary card component adds a "visually
hidden" span to the action's text with the title of the summary
card—this resulted in "Reorder sections Sections" and "Add section
Sections" for screen readers, which is potentially confusing, and at
the very least a bit awkward. By simplifying the text we can avoid
this, and it is still clear on the UI what the actions do, given their
location within the Sections summary card.
---
app/views/manuals/show.html.erb | 4 ++--
features/step_definitions/manual_steps.rb | 6 +++---
features/support/manual_helpers.rb | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/views/manuals/show.html.erb b/app/views/manuals/show.html.erb
index 25ed621c9..e80bb3ab4 100644
--- a/app/views/manuals/show.html.erb
+++ b/app/views/manuals/show.html.erb
@@ -85,11 +85,11 @@
title: "Sections",
summary_card_actions: [
{
- label: "Reorder sections",
+ label: "Reorder",
href: reorder_manual_sections_path(manual)
},
{
- label: "Add section",
+ label: "Add",
href: new_manual_section_path(manual)
},
],
diff --git a/features/step_definitions/manual_steps.rb b/features/step_definitions/manual_steps.rb
index a901b0229..65fc6fb71 100644
--- a/features/step_definitions/manual_steps.rb
+++ b/features/step_definitions/manual_steps.rb
@@ -522,7 +522,7 @@
}
go_to_manual_page(@manual_fields[:title])
- click_on "Add section"
+ click_on "Add Sections"
fill_in_fields(@section_fields)
end
@@ -599,7 +599,7 @@
Then(/^I can see the change note form when adding a new section$/) do
go_to_manual_page(@manual.title)
- click_on "Add section"
+ click_on "Add Sections"
check_that_change_note_fields_are_present(note_field_only: true, note: "New section added.")
end
@@ -762,7 +762,7 @@
end
When(/^I reorder the sections$/) do
- click_on("Reorder sections")
+ click_on("Reorder Sections")
# Using capybara drag_to doesn't work reliably with our jQuery sortable
# therefore we have to take a manual approach to replicating the drag/drop
inputs = page.all(".reorderable-document-list li.ui-sortable-handle input", visible: false)
diff --git a/features/support/manual_helpers.rb b/features/support/manual_helpers.rb
index 70f7ff847..1bc4d42ac 100644
--- a/features/support/manual_helpers.rb
+++ b/features/support/manual_helpers.rb
@@ -32,7 +32,7 @@ def create_manual_without_ui(fields, organisation_slug: "ministry-of-tea")
def create_section(manual_title, fields, save: true)
go_to_manual_page(manual_title)
- click_on "Add section"
+ click_on "Add Sections"
fill_in_fields(fields)
@@ -43,7 +43,7 @@ def create_section(manual_title, fields, save: true)
def create_expanded_section(manual_title, fields)
go_to_manual_page(manual_title)
- click_on "Add section"
+ click_on "Add Sections"
fill_in_fields(fields)