Browse Source

Update back and cancel links

pull/1752/head
Kat 3 years ago
parent
commit
599b4a0283
  1. 2
      app/views/duplicate_logs/show.erb
  2. 4
      app/views/logs/delete_duplicates.html.erb
  3. 18
      spec/requests/duplicate_logs_controller_spec.rb

2
app/views/duplicate_logs/show.erb

@ -11,7 +11,7 @@
<% @all_duplicates.each_with_index do |log, index| %>
<%= render partial: "duplicate_log", locals: { log: log } %>
<%= render partial: "duplicate_log_check_answers", locals: { log: log } %>
<%= govuk_button_link_to "Keep this log and delete duplicates", "#" %>
<%= govuk_button_link_to "Keep this log and delete duplicates", log.lettings? ? lettings_log_delete_duplicates_path(log) : sales_log_delete_duplicates_path(log) %>
<% if index < @all_duplicates.count - 1 %>
<hr class="govuk-section-break govuk-section-break--visible govuk-section-break--m">
<% end %>

4
app/views/logs/delete_duplicates.html.erb

@ -1,6 +1,6 @@
<% content_for :before_content do %>
<% content_for :title, "Are you sure you want to delete #{@duplicate_logs.count == 1 ? 'this duplicate log' : 'these duplicate logs'}?" %>
<%= govuk_back_link href: @log.lettings? ? lettings_log_path(@log) : sales_log_path(@log) %>
<%= govuk_back_link href: @log.lettings? ? lettings_log_duplicate_logs_path(@log) : sales_log_duplicate_logs_path(@log) %>
<% end %>
<div class="govuk-grid-row">
@ -31,7 +31,7 @@
params: { ids: @duplicate_logs.map(&:id) } %>
<%= govuk_button_link_to(
"Cancel",
@log.lettings? ? lettings_log_path(@log) : sales_log_path(@log),
@log.lettings? ? lettings_log_duplicate_logs_path(@log) : sales_log_duplicate_logs_path(@log),
secondary: true,
) %>
</div>

18
spec/requests/duplicate_logs_controller_spec.rb

@ -75,6 +75,9 @@ RSpec.describe DuplicateLogsController, type: :request do
it "displays buttons to delete" do
expect(page).to have_link("Keep this log and delete duplicates", count: 3)
expect(page).to have_link("Keep this log and delete duplicates", href: "/lettings-logs/#{lettings_log.id}/delete-duplicates")
expect(page).to have_link("Keep this log and delete duplicates", href: "/lettings-logs/#{duplicate_logs.first.id}/delete-duplicates")
expect(page).to have_link("Keep this log and delete duplicates", href: "/lettings-logs/#{duplicate_logs.second.id}/delete-duplicates")
end
end
@ -104,6 +107,9 @@ RSpec.describe DuplicateLogsController, type: :request do
it "displays buttons to delete" do
expect(page).to have_link("Keep this log and delete duplicates", count: 3)
expect(page).to have_link("Keep this log and delete duplicates", href: "/sales-logs/#{sales_log.id}/delete-duplicates")
expect(page).to have_link("Keep this log and delete duplicates", href: "/sales-logs/#{duplicate_logs.first.id}/delete-duplicates")
expect(page).to have_link("Keep this log and delete duplicates", href: "/sales-logs/#{duplicate_logs.second.id}/delete-duplicates")
end
end
end
@ -142,7 +148,8 @@ RSpec.describe DuplicateLogsController, type: :request do
expect(page).to have_button(text: "Delete this log")
expect(page).to have_link(text: "Log #{duplicate_log.id}", href: sales_log_path(duplicate_log.id))
expect(page).not_to have_link(text: "Log #{id}", href: sales_log_path(id))
expect(page).to have_link(text: "Cancel", href: sales_log_path(id)) # update with correct path when known
expect(page).to have_link(text: "Cancel", href: sales_log_duplicate_logs_path(id))
expect(page).to have_link(text: "Back", href: sales_log_duplicate_logs_path(id))
end
end
@ -169,7 +176,8 @@ RSpec.describe DuplicateLogsController, type: :request do
expect(page).to have_button(text: "Delete these logs")
expect(page).to have_link(text: "Log #{duplicate_log.id}", href: sales_log_path(duplicate_log.id))
expect(page).to have_link(text: "Log #{duplicate_log_2.id}", href: sales_log_path(duplicate_log_2.id))
expect(page).to have_link(text: "Cancel", href: sales_log_path(id)) # update with correct path when known
expect(page).to have_link(text: "Cancel", href: sales_log_duplicate_logs_path(id))
expect(page).to have_link(text: "Back", href: sales_log_duplicate_logs_path(id))
end
end
@ -230,7 +238,8 @@ RSpec.describe DuplicateLogsController, type: :request do
expect(page).to have_button(text: "Delete this log")
expect(page).to have_link(text: "Log #{duplicate_log.id}", href: lettings_log_path(duplicate_log.id))
expect(page).not_to have_link(text: "Log #{id}", href: lettings_log_path(id))
expect(page).to have_link(text: "Cancel", href: lettings_log_path(id)) # update with correct path when known
expect(page).to have_link(text: "Cancel", href: lettings_log_duplicate_logs_path(id))
expect(page).to have_link(text: "Back", href: lettings_log_duplicate_logs_path(id))
end
end
@ -257,7 +266,8 @@ RSpec.describe DuplicateLogsController, type: :request do
expect(page).to have_button(text: "Delete these logs")
expect(page).to have_link(text: "Log #{duplicate_log.id}", href: lettings_log_path(duplicate_log.id))
expect(page).to have_link(text: "Log #{duplicate_log_2.id}", href: lettings_log_path(duplicate_log_2.id))
expect(page).to have_link(text: "Cancel", href: lettings_log_path(id)) # update with correct path when known
expect(page).to have_link(text: "Cancel", href: lettings_log_duplicate_logs_path(id))
expect(page).to have_link(text: "Back", href: lettings_log_duplicate_logs_path(id))
end
end

Loading…
Cancel
Save