diff --git a/app/models/log.rb b/app/models/log.rb index ef8785cde..55f4ae33d 100644 --- a/app/models/log.rb +++ b/app/models/log.rb @@ -169,6 +169,7 @@ class Log < ApplicationRecord def setup_completed? form.setup_sections.all? { |sections| sections.subsections.all? { |subsection| subsection.status(self) == :completed } } end + private # Handle logs that are older than previous collection start date diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index 619bbef41..f71dd4d03 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -1376,6 +1376,8 @@ RSpec.describe LettingsLogsController, type: :request do expect(response).to have_http_status(:ok) expect(page).to have_content("Are you sure you want to delete this log?") + expect(page).to have_button(text: "Delete this log") + expect(page).to have_button(text: "Cancel") end end diff --git a/spec/requests/sales_logs_controller_spec.rb b/spec/requests/sales_logs_controller_spec.rb index f12f4aa8c..da2e5e1a6 100644 --- a/spec/requests/sales_logs_controller_spec.rb +++ b/spec/requests/sales_logs_controller_spec.rb @@ -721,6 +721,8 @@ RSpec.describe SalesLogsController, type: :request do expect(response).to have_http_status(:ok) expect(page).to have_content("Are you sure you want to delete this log?") + expect(page).to have_button(text: "Delete this log") + expect(page).to have_button(text: "Cancel") end end