From 97dddac98a2ca4aeadd6169c3b32aa23a6c60b43 Mon Sep 17 00:00:00 2001 From: baarkerlounger Date: Tue, 12 Apr 2022 11:07:31 +0100 Subject: [PATCH] Fix new specs --- app/models/case_log.rb | 1 - spec/requests/case_logs_controller_spec.rb | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/models/case_log.rb b/app/models/case_log.rb index b398c4eb6..99ea8fdb5 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -43,7 +43,6 @@ class CaseLog < ApplicationRecord } scope :filter_by_year, ->(year) { where(startdate: Time.utc(year.to_i, 4, 1)...Time.utc(year.to_i + 1, 4, 1)) } - AUTOGENERATED_FIELDS = %w[id status created_at updated_at discarded_at].freeze OPTIONAL_FIELDS = %w[postcode_known la_known first_time_property_let_as_social_housing tenant_code propcode].freeze RENT_TYPE_MAPPING = { 0 => 1, 1 => 2, 2 => 2, 3 => 3, 4 => 3, 5 => 3 }.freeze diff --git a/spec/requests/case_logs_controller_spec.rb b/spec/requests/case_logs_controller_spec.rb index e27a3d485..1031960bd 100644 --- a/spec/requests/case_logs_controller_spec.rb +++ b/spec/requests/case_logs_controller_spec.rb @@ -225,13 +225,13 @@ RSpec.describe CaseLogsController, type: :request do end it "shows case logs for multiple selected years" do - get "/logs?year[]=2021&year[]=2022", headers: headers, params: {} + get "/logs?years[]=2021&years[]=2022", headers: headers, params: {} expect(page).to have_link(case_log_2021.id.to_s) expect(page).to have_link(case_log_2022.id.to_s) end it "shows case logs for one selected year" do - get "/logs?year[]=2021", headers: headers, params: {} + get "/logs?years[]=2021", headers: headers, params: {} expect(page).to have_link(case_log_2021.id.to_s) expect(page).not_to have_link(case_log_2022.id.to_s) end @@ -260,14 +260,14 @@ RSpec.describe CaseLogsController, type: :request do end it "shows case logs for multiple selected statuses and years" do - get "/logs?year[]=2021&year[]=2022&status[]=in_progress&status[]=completed", headers: headers, params: {} + get "/logs?years[]=2021&years[]=2022&status[]=in_progress&status[]=completed", headers: headers, params: {} expect(page).to have_link(case_log_2021.id.to_s) expect(page).to have_link(case_log_2022.id.to_s) expect(page).to have_link(case_log_2022_in_progress.id.to_s) end it "shows case logs for one selected status" do - get "/logs?year[]=2022&status[]=in_progress", headers: headers, params: {} + get "/logs?years[]=2022&status[]=in_progress", headers: headers, params: {} expect(page).to have_link(case_log_2022_in_progress.id.to_s) expect(page).not_to have_link(case_log_2021.id.to_s) expect(page).not_to have_link(case_log_2022.id.to_s)