Merge pull request #9689 from alphagov/content-modelling/743-select-c…

…ontent-block

Content modelling/743 select content block

lib/engines/content_block_manager/app/views/content_block_manager/content_block/documents/_schemas.html.erb

@@ -14,10 +14,19 @@
     schemas: @schemas,
   ) %>
 
-  <%= render "govuk_publishing_components/components/button", {
-    text: "Save and continue",
-    name: "save_and_continue",
-    value: "Save and continue",
-    type: "submit",
-  } %>
+  <div class="govuk-button-group">
+    <%= render "govuk_publishing_components/components/button", {
+      text: "Save and continue",
+      name: "save_and_continue",
+      value: "Save and continue",
+      type: "submit",
+    } %>
+    <%= render "govuk_publishing_components/components/button", {
+      text: "Cancel",
+      name: "cancel",
+      value: "cancel",
+      href: content_block_manager.content_block_manager_content_block_documents_path,
+      secondary_solid: true,
+    } %>
+  </div>
 <% end %>

lib/engines/content_block_manager/app/views/content_block_manager/content_block/documents/new.html.erb

@@ -1,12 +1,12 @@
-<% content_for :context, product_name %>
+<% content_for :context, "Create a content block" %>
 
 <% if @schemas %>
   <% content_for :back_link do %>
     <%= render "govuk_publishing_components/components/back_link", {
       href: content_block_manager.content_block_manager_content_block_documents_path,
     } %>
   <% end %>
-  <% content_for :page_title, "Select a block type" %>
+  <% content_for :page_title, "Select a content block" %>
   <%= render partial: "content_block_manager/content_block/documents/schemas", locals: { schemas: @schemas} %>
 <% else %>
   <% content_for :back_link do %>

lib/engines/content_block_manager/features/create_object.feature

@@ -16,6 +16,7 @@ Feature: Create a content object
     And I click to create an object
     Then I should see all the schemas listed
     And I should see a back link to the document list page
+    And I should see a Cancel button to the document list page
     When I click on the "email_address" schema
     Then I should see a form for the schema
     And I should see a back link to the select schema page

lib/engines/content_block_manager/features/step_definitions/content_block_manager_steps.rb

@@ -69,6 +69,10 @@
   expect(page).to have_link("Back", href: content_block_manager.content_block_manager_content_block_documents_path)
 end
 
+Then("I should see a Cancel button to the document list page") do
+  expect(page).to have_link("Cancel", href: content_block_manager.content_block_manager_content_block_documents_path)
+end
+
 Then("I should see a back link to the select schema page") do
   expect(page).to have_link("Back", href: content_block_manager.new_content_block_manager_content_block_document_path)
 end

lib/engines/content_block_manager/test/integration/content_block/documents_test.rb

@@ -98,7 +98,7 @@ class ContentBlockManager::ContentBlock::DocumentsTest < ActionDispatch::Integra
 
       visit new_content_block_manager_content_block_document_path
 
-      assert_text "Select a block type"
+      assert_text "Select a content block"
     end
   end