Browse Source

Move back link to before_content

pull/21/head
baarkerlounger 3 years ago
parent
commit
ab28996e83
  1. 6
      app/views/form/questions/previous_housing_situation.html.erb
  2. 6
      app/views/form/questions/tenant_age.html.erb
  3. 8
      app/views/form/questions/tenant_code.html.erb
  4. 6
      app/views/form/questions/tenant_gender.html.erb
  5. 22
      spec/features/case_log_spec.rb

6
app/views/form/questions/previous_housing_situation.html.erb

@ -25,8 +25,10 @@
] %>
<% previous_question = Form.previous_question("previous_housing_situation") %>
<%= govuk_back_link href: "/case_logs/#{case_log_id}/#{previous_question}" do %>
Back
<% content_for :before_content do %>
<%= govuk_back_link href: "/case_logs/#{case_log_id}/#{previous_question}" do %>
Back
<% end %>
<% end %>
<%= turbo_frame_tag "case_log_form", target: "_top" do %>

6
app/views/form/questions/tenant_age.html.erb

@ -1,6 +1,8 @@
<% previous_question = Form.previous_question("tenant_age") %>
<%= govuk_back_link href: "/case_logs/#{case_log_id}/#{previous_question}" do %>
Back
<% content_for :before_content do %>
<%= govuk_back_link href: "/case_logs/#{case_log_id}/#{previous_question}" do %>
Back
<% end %>
<% end %>
<%= turbo_frame_tag "case_log_form", target: "_top" do %>

8
app/views/form/questions/tenant_code.html.erb

@ -1,5 +1,11 @@
<% previous_question = Form.previous_question("tenant_code") %>
<% content_for :before_content do %>
<%= govuk_back_link href: "/case_logs/#{case_log_id}/#{previous_question}" do %>
Back
<% end %>
<% end %>
<%= turbo_frame_tag "case_log_form", target: "_top" do %>
<%= render GovukComponent::BackLinkComponent.new(href: "/case_logs/#{case_log_id}", text: 'Back') do %><% end %>
<%= form_with action: '/case_logs', method: "next_question", builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %>
<%= f.govuk_text_field :tenant_code,
hint: { text: "More detail" },

6
app/views/form/questions/tenant_gender.html.erb

@ -6,8 +6,10 @@
] %>
<% previous_question = Form.previous_question("tenant_gender") %>
<%= govuk_back_link href: "/case_logs/#{case_log_id}/#{previous_question}" do %>
Back
<% content_for :before_content do %>
<%= govuk_back_link href: "/case_logs/#{case_log_id}/#{previous_question}" do %>
Back
<% end %>
<% end %>
<%= turbo_frame_tag "case_log_form", target: "_top" do %>

22
spec/features/case_log_spec.rb

@ -38,19 +38,19 @@ RSpec.describe "Test Features" do
expect(page).to have_field("tenant-age-field")
end
end
end
describe "Back link directs correctly" do
it "go back to tasklist page from tenant code" do
visit("/case_logs/#{id}/tenant_code")
click_link(text: 'Back')
expect(page).to have_content("Tasklist for log #{id}")
end
describe "Back link directs correctly" do
it "go back to tasklist page from tenant code" do
visit("/case_logs/#{id}/tenant_code")
click_link(text: 'Back')
expect(page).to have_content("Tasklist for log #{id}")
end
it "go back to tenant code page from tenant age page" do
visit("/case_logs/#{id}/tenant_age")
click_link(text: 'Back')
expect(page).to have_field("tenant-code-field")
it "go back to tenant code page from tenant age page" do
visit("/case_logs/#{id}/tenant_age")
click_link(text: 'Back')
expect(page).to have_field("tenant-code-field")
end
end
end
end

Loading…
Cancel
Save