Browse Source

Update check answers to use the correct logs

pull/1793/head
Kat 3 years ago
parent
commit
03e6fe8119
  1. 12
      app/views/duplicate_logs/_duplicate_log_check_answers.erb
  2. 3
      spec/requests/duplicate_logs_controller_spec.rb

12
app/views/duplicate_logs/_duplicate_log_check_answers.erb

@ -7,14 +7,14 @@
<% row.value do %> <% row.value do %>
<%= simple_format( <%= simple_format(
get_answer_label(question, @log), get_answer_label(question, log),
wrapper_tag: "span", wrapper_tag: "span",
class: "govuk-!-margin-right-4", class: "govuk-!-margin-right-4",
) %> ) %>
<% extra_value = question.get_extra_check_answer_value(@log) %> <% extra_value = question.get_extra_check_answer_value(log) %>
<% if extra_value && question.answer_label(@log, current_user).present? %> <% if extra_value && question.answer_label(log, current_user).present? %>
<%= simple_format( <%= simple_format(
extra_value, extra_value,
wrapper_tag: "span", wrapper_tag: "span",
@ -22,14 +22,14 @@
) %> ) %>
<% end %> <% end %>
<% question.get_inferred_answers(@log).each do |inferred_answer| %> <% question.get_inferred_answers(log).each do |inferred_answer| %>
<span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span> <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span>
<% end %> <% end %>
<% end %> <% end %>
<% row.action( <% row.action(
text: question.action_text(@log), text: question.action_text(log),
href: duplicate_logs_action_href(@log, question.page.id, @original_log_id), href: duplicate_logs_action_href(log, question.page.id, @original_log_id),
visually_hidden_text: question.check_answer_label.to_s.downcase, visually_hidden_text: question.check_answer_label.to_s.downcase,
) %> ) %>
<% end %> <% end %>

3
spec/requests/duplicate_logs_controller_spec.rb

@ -57,6 +57,9 @@ RSpec.describe DuplicateLogsController, type: :request do
expect(page).to have_content("Q37 - Lead tenant’s working situation", count: 3) expect(page).to have_content("Q37 - Lead tenant’s working situation", count: 3)
expect(page).to have_content("Household rent and charges", count: 3) expect(page).to have_content("Household rent and charges", count: 3)
expect(page).to have_link("Change", count: 21) expect(page).to have_link("Change", count: 21)
expect(page).to have_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?original_log_id=#{lettings_log.id}&referrer=interruption_screen")
expect(page).to have_link("Change", href: "/lettings-logs/#{duplicate_logs[0].id}/tenant-code?original_log_id=#{lettings_log.id}&referrer=interruption_screen")
expect(page).to have_link("Change", href: "/lettings-logs/#{duplicate_logs[1].id}/tenant-code?original_log_id=#{lettings_log.id}&referrer=interruption_screen")
end end
it "displays buttons to delete" do it "displays buttons to delete" do

Loading…
Cancel
Save