diff --git a/app/views/case_logs/_log_list.html.erb b/app/views/case_logs/_log_list.html.erb
index 37d0dca14..3edfabe06 100644
--- a/app/views/case_logs/_log_list.html.erb
+++ b/app/views/case_logs/_log_list.html.erb
@@ -15,7 +15,7 @@
<%= link_to log.id, case_log_path(log) %>
- <%= log.postcode %>
+ <%= log.property_postcode %>
|
<%= log.tenant_code %>
diff --git a/db/migrate/20211011115946_rename_economic_status_fields.rb b/db/migrate/20211011115946_rename_economic_status_fields.rb
index 661adb872..b7c6a94ab 100644
--- a/db/migrate/20211011115946_rename_economic_status_fields.rb
+++ b/db/migrate/20211011115946_rename_economic_status_fields.rb
@@ -8,6 +8,7 @@ class RenameEconomicStatusFields < ActiveRecord::Migration[6.1]
t.rename :person_6_economic, :person_6_economic_status
t.rename :person_7_economic, :person_7_economic_status
t.rename :person_8_economic, :person_8_economic_status
+ t.rename :postcode, :property_postcode
end
end
end
diff --git a/db/schema.rb b/db/schema.rb
index c515bebfb..3f5910828 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -27,7 +27,6 @@ ActiveRecord::Schema.define(version: 2021_10_11_115946) do
t.string "previous_housing_situation"
t.integer "prior_homelessness"
t.string "armed_forces"
- t.string "postcode"
t.string "tenant_economic_status"
t.integer "household_number_of_other_members"
t.string "person_2_relationship"
@@ -102,7 +101,6 @@ ActiveRecord::Schema.define(version: 2021_10_11_115946) do
t.string "time_lived_in_la"
t.string "time_on_la_waiting_list"
t.string "previous_la"
- t.string "property_postcode"
t.string "reasonable_preference"
t.string "reasonable_preference_reason"
t.string "cbl_letting"
@@ -132,6 +130,7 @@ ActiveRecord::Schema.define(version: 2021_10_11_115946) do
t.boolean "reasonable_preference_reason_medical_grounds"
t.boolean "reasonable_preference_reason_avoid_hardship"
t.boolean "reasonable_preference_reason_do_not_know"
+ t.string "property_postcode"
end
end
diff --git a/spec/factories/case_log.rb b/spec/factories/case_log.rb
index d55408242..a9aa4ab56 100644
--- a/spec/factories/case_log.rb
+++ b/spec/factories/case_log.rb
@@ -4,14 +4,14 @@ FactoryBot.define do
trait :in_progress do
status { 0 }
tenant_code { "TH356" }
- postcode { "SW2 6HI" }
+ property_postcode { "SW2 6HI" }
previous_postcode { "P0 5ST" }
tenant_age { "12" }
end
trait :submitted do
status { 1 }
tenant_code { "BZ737" }
- postcode { "NW1 7TY" }
+ property_postcode { "NW1 7TY" }
end
created_at { Time.zone.now }
updated_at { Time.zone.now }
diff --git a/spec/helpers/tasklist_helper_spec.rb b/spec/helpers/tasklist_helper_spec.rb
index ec07092f6..f7b2a6534 100644
--- a/spec/helpers/tasklist_helper_spec.rb
+++ b/spec/helpers/tasklist_helper_spec.rb
@@ -73,7 +73,7 @@ RSpec.describe TasklistHelper do
it "returns the number of sections in progress" do
@form = Form.new(2021, 2022)
- expect(get_sections_count(@form, case_log, :in_progress)).to eq(2)
+ expect(get_sections_count(@form, case_log, :in_progress)).to eq(3)
end
it "returns 0 for invalid state" do
diff --git a/spec/views/case_log_index_view_spec.rb b/spec/views/case_log_index_view_spec.rb
index f99c82419..b97347cb6 100644
--- a/spec/views/case_log_index_view_spec.rb
+++ b/spec/views/case_log_index_view_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe "case_logs/index" do
expect(rendered).to match(/Logs you need to complete/)
expect(rendered).not_to match(/Logs you've submitted/)
expect(rendered).to match(in_progress_log.tenant_code)
- expect(rendered).to match(in_progress_log.postcode)
+ expect(rendered).to match(in_progress_log.property_postcode)
end
end
@@ -25,7 +25,7 @@ RSpec.describe "case_logs/index" do
expect(rendered).to match(/Logs you've submitted/)
expect(rendered).not_to match(/Logs you need to complete/)
expect(rendered).to match(submitted_log.tenant_code)
- expect(rendered).to match(submitted_log.postcode)
+ expect(rendered).to match(submitted_log.property_postcode)
end
end
|