baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

test: update tests to new flow

pull/980/head
natdeanlewissoftwire 2 years ago
parent
5c035e0c71
commit
8c3f852fbc
6 changed files with 41 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      app/models/location.rb
  2. 9
      app/models/scheme.rb
  3. 4
      config/locales/en.yml
  4. 4
      spec/models/scheme_spec.rb
  5. 6
      spec/requests/locations_controller_spec.rb
  6. 36
      spec/requests/schemes_controller_spec.rb

5
app/models/location.rb
Unescape View File

@ -375,7 +375,8 @@ class Location < ApplicationRecord
def status def status
return :active if deactivation_date.blank? return :active if deactivation_date.blank?
return :deactivating_soon if Time.zone.now < deactivation_date return :deactivating_soon if Time.zone.now < deactivation_date
return :deactivated if Time.zone.now >= deactivation_date
:deactivated
end end
def active? def active?
@ -395,7 +396,7 @@ class Location < ApplicationRecord
collection_start_date = FormHandler.instance.current_collection_start_date collection_start_date = FormHandler.instance.current_collection_start_date
if [day, month, year].any?(&:blank?) if [day, month, year].any?(&:blank?)
errors.add(:deactivation_date, message: I18n.t("validations.location.deactivation_date.not_entered")) errors.add(:deactivation_date, message: I18n.t("validations.location.deactivation_date.invalid"))
elsif !Date.valid_date?(year.to_i, month.to_i, day.to_i) elsif !Date.valid_date?(year.to_i, month.to_i, day.to_i)
errors.add(:deactivation_date, message: I18n.t("validations.location.deactivation_date.invalid")) errors.add(:deactivation_date, message: I18n.t("validations.location.deactivation_date.invalid"))
elsif !Date.new(year.to_i, month.to_i, day.to_i).between?(collection_start_date, Date.new(2200, 1, 1)) elsif !Date.new(year.to_i, month.to_i, day.to_i).between?(collection_start_date, Date.new(2200, 1, 1))

9
app/models/scheme.rb
Unescape View File

@ -218,25 +218,26 @@ class Scheme < ApplicationRecord
def status def status
return :active if deactivation_date.blank? return :active if deactivation_date.blank?
return :deactivating_soon if Time.zone.now < deactivation_date return :deactivating_soon if Time.zone.now < deactivation_date
return :deactivated if Time.zone.now >= deactivation_date
:deactivated
end end
def active? def active?
status == :active status == :active
end end
def run_deactivation_validations def implicit_run_deactivation_validations
deactivation_date.present? || @run_deactivation_validations deactivation_date.present? || @run_deactivation_validations
end end
def deactivation_date_errors def deactivation_date_errors
return unless run_deactivation_validations return unless implicit_run_deactivation_validations
collection_start_date = FormHandler.instance.current_collection_start_date collection_start_date = FormHandler.instance.current_collection_start_date
if deactivation_date_type.blank? if deactivation_date_type.blank?
errors.add(:deactivation_date_type, message: I18n.t("validations.scheme.deactivation_date.not_selected")) errors.add(:deactivation_date_type, message: I18n.t("validations.scheme.deactivation_date.not_selected"))
elsif deactivation_date.blank? elsif deactivation_date.blank?
errors.add(:deactivation_date, message: I18n.t("validations.scheme.deactivation_date.not_entered")) errors.add(:deactivation_date, message: I18n.t("validations.scheme.deactivation_date.invalid"))
elsif !deactivation_date.between?(collection_start_date, Date.new(2200, 1, 1)) elsif !deactivation_date.between?(collection_start_date, Date.new(2200, 1, 1))
errors.add(:deactivation_date, message: I18n.t("validations.scheme.deactivation_date.out_of_range", date: collection_start_date.to_formatted_s(:govuk_date))) errors.add(:deactivation_date, message: I18n.t("validations.scheme.deactivation_date.out_of_range", date: collection_start_date.to_formatted_s(:govuk_date)))
end end

4
config/locales/en.yml
Unescape View File

@ -315,13 +315,13 @@ en:
scheme: scheme:
deactivation_date: deactivation_date:
not_selected: "Select one of the options" not_selected: "Select one of the options"
not_entered: "Enter a valid day, month and year" invalid: "Enter a valid day, month and year"
out_of_range: "The date must be on or after the %{date}" out_of_range: "The date must be on or after the %{date}"
location: location:
deactivation_date: deactivation_date:
not_selected: "Select one of the options" not_selected: "Select one of the options"
not_entered: "Enter a valid day, month and year" invalid: "Enter a valid day, month and year"
out_of_range: "The date must be on or after the %{date}" out_of_range: "The date must be on or after the %{date}"
soft_validations: soft_validations:

4
spec/models/scheme_spec.rb
Unescape View File

@ -101,24 +101,28 @@ RSpec.describe Scheme, type: :model do
it "returns active if the scheme is not deactivated" do it "returns active if the scheme is not deactivated" do
scheme.deactivation_date = nil scheme.deactivation_date = nil
scheme.deactivation_date_type = nil
scheme.save! scheme.save!
expect(scheme.status).to eq(:active) expect(scheme.status).to eq(:active)
end end
it "returns deactivating soon if deactivation_date is in the future" do it "returns deactivating soon if deactivation_date is in the future" do
scheme.deactivation_date = Time.zone.local(2022, 8, 8) scheme.deactivation_date = Time.zone.local(2022, 8, 8)
scheme.deactivation_date_type = "other"
scheme.save! scheme.save!
expect(scheme.status).to eq(:deactivating_soon) expect(scheme.status).to eq(:deactivating_soon)
end end
it "returns deactivated if deactivation_date is in the past" do it "returns deactivated if deactivation_date is in the past" do
scheme.deactivation_date = Time.zone.local(2022, 4, 8) scheme.deactivation_date = Time.zone.local(2022, 4, 8)
scheme.deactivation_date_type = "other"
scheme.save! scheme.save!
expect(scheme.status).to eq(:deactivated) expect(scheme.status).to eq(:deactivated)
end end
it "returns deactivated if deactivation_date is today" do it "returns deactivated if deactivation_date is today" do
scheme.deactivation_date = Time.zone.local(2022, 6, 7) scheme.deactivation_date = Time.zone.local(2022, 6, 7)
scheme.deactivation_date_type = "other"
scheme.save! scheme.save!
expect(scheme.status).to eq(:deactivated) expect(scheme.status).to eq(:deactivated)
end end

6
spec/requests/locations_controller_spec.rb
Unescape View File

@ -1310,7 +1310,7 @@ RSpec.describe LocationsController, type: :request do
it "displays page with an error message" do it "displays page with an error message" do
expect(response).to have_http_status(:unprocessable_entity) expect(response).to have_http_status(:unprocessable_entity)
expect(page).to have_content(I18n.t("validations.location.deactivation_date.not_entered")) expect(page).to have_content(I18n.t("validations.location.deactivation_date.invalid"))
end end
end end
@ -1319,7 +1319,7 @@ RSpec.describe LocationsController, type: :request do
it "displays page with an error message" do it "displays page with an error message" do
expect(response).to have_http_status(:unprocessable_entity) expect(response).to have_http_status(:unprocessable_entity)
expect(page).to have_content(I18n.t("validations.location.deactivation_date.not_entered")) expect(page).to have_content(I18n.t("validations.location.deactivation_date.invalid"))
end end
end end
@ -1328,7 +1328,7 @@ RSpec.describe LocationsController, type: :request do
it "displays page with an error message" do it "displays page with an error message" do
expect(response).to have_http_status(:unprocessable_entity) expect(response).to have_http_status(:unprocessable_entity)
expect(page).to have_content(I18n.t("validations.location.deactivation_date.not_entered")) expect(page).to have_content(I18n.t("validations.location.deactivation_date.invalid"))
end end
end end
end end

36
spec/requests/schemes_controller_spec.rb
Unescape View File

@ -251,21 +251,24 @@ RSpec.describe SchemesController, type: :request do
Timecop.freeze(Time.utc(2022, 10, 10)) Timecop.freeze(Time.utc(2022, 10, 10))
sign_in user sign_in user
scheme.deactivation_date = deactivation_date scheme.deactivation_date = deactivation_date
scheme.deactivation_date_type = deactivation_date_type
scheme.save! scheme.save!
get "/schemes/#{scheme.id}" get "/schemes/#{scheme.id}"
end end
context "with active scheme" do context "with active scheme" do
let(:deactivation_date) { nil } let(:deactivation_date) { nil }
let(:deactivation_date_type) { nil }
it "renders deactivate this scheme" do it "renders deactivate this scheme" do
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
expect(page).to have_link("Deactivate this scheme", href: "/schemes/#{scheme.id}/deactivate") expect(page).to have_link("Deactivate this scheme", href: "/schemes/#{scheme.id}/new-deactivation")
end end
end end
context "with deactivated scheme" do context "with deactivated scheme" do
let(:deactivation_date) { Time.utc(2022, 10, 9) } let(:deactivation_date) { Time.utc(2022, 10, 9) }
let(:deactivation_date_type) { "other" }
it "renders reactivate this scheme" do it "renders reactivate this scheme" do
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
@ -275,6 +278,7 @@ RSpec.describe SchemesController, type: :request do
context "with scheme that's deactivating soon" do context "with scheme that's deactivating soon" do
let(:deactivation_date) { Time.utc(2022, 10, 12) } let(:deactivation_date) { Time.utc(2022, 10, 12) }
let(:deactivation_date_type) { "other" }
it "renders reactivate this scheme" do it "renders reactivate this scheme" do
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
@ -1742,7 +1746,7 @@ RSpec.describe SchemesController, type: :request do
describe "#deactivate" do describe "#deactivate" do
context "when not signed in" do context "when not signed in" do
it "redirects to the sign in page" do it "redirects to the sign in page" do
patch "/schemes/1/deactivate" patch "/schemes/1/new-deactivation"
expect(response).to redirect_to("/account/sign-in") expect(response).to redirect_to("/account/sign-in")
end end
end end
@ -1752,7 +1756,7 @@ RSpec.describe SchemesController, type: :request do
before do before do
sign_in user sign_in user
patch "/schemes/1/deactivate" patch "/schemes/1/new-deactivation"
end end
it "returns 401 unauthorized" do it "returns 401 unauthorized" do
@ -1770,29 +1774,37 @@ RSpec.describe SchemesController, type: :request do
before do before do
Timecop.freeze(Time.utc(2022, 10, 10)) Timecop.freeze(Time.utc(2022, 10, 10))
sign_in user sign_in user
patch "/schemes/#{scheme.id}/deactivate", params: patch "/schemes/#{scheme.id}/new-deactivation", params:
end end
context "with default date" do context "with default date" do
let(:params) { { scheme: { deactivation_date_type: "default" } } } let(:params) { { scheme: { deactivation_date_type: "default", deactivation_date: } } }
it "renders the confirmation page" do it "redirects to the confirmation page" do
follow_redirect!
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
expect(page).to have_content("This change will affect #{scheme.lettings_logs.count} logs") expect(page).to have_content("This change will affect #{scheme.lettings_logs.count} logs")
end end
end end
context "with other date" do context "with other date" do
let(:params) { { scheme: { deactivation_date: "other", "deactivation_date(3i)": "10", "deactivation_date(2i)": "10", "deactivation_date(1i)": "2022" } } } let(:params) { { scheme: { deactivation_date_type: "other", "deactivation_date(3i)": "10", "deactivation_date(2i)": "10", "deactivation_date(1i)": "2022" } } }
it "renders the confirmation page" do it "redirects to the confirmation page" do
follow_redirect!
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
expect(page).to have_content("This change will affect #{scheme.lettings_logs.count} logs") expect(page).to have_content("This change will affect #{scheme.lettings_logs.count} logs")
end end
end end
context "when confirming deactivation" do context "when confirming deactivation" do
let(:params) { { scheme: { deactivation_date:, confirm: true } } } let(:params) { { scheme: { deactivation_date:, confirm: true, deactivation_date_type: "other" } } }
before do
Timecop.freeze(Time.utc(2022, 10, 10))
sign_in user
patch "/schemes/#{scheme.id}/deactivate", params:
end
it "updates existing scheme with valid deactivation date and renders scheme page" do it "updates existing scheme with valid deactivation date and renders scheme page" do
follow_redirect! follow_redirect!
@ -1836,7 +1848,7 @@ RSpec.describe SchemesController, type: :request do
it "displays page with an error message" do it "displays page with an error message" do
expect(response).to have_http_status(:unprocessable_entity) expect(response).to have_http_status(:unprocessable_entity)
expect(page).to have_content(I18n.t("validations.scheme.deactivation_date.not_entered")) expect(page).to have_content(I18n.t("validations.scheme.deactivation_date.invalid"))
end end
end end
@ -1845,7 +1857,7 @@ RSpec.describe SchemesController, type: :request do
it "displays page with an error message" do it "displays page with an error message" do
expect(response).to have_http_status(:unprocessable_entity) expect(response).to have_http_status(:unprocessable_entity)
expect(page).to have_content(I18n.t("validations.scheme.deactivation_date.not_entered")) expect(page).to have_content(I18n.t("validations.scheme.deactivation_date.invalid"))
end end
end end
@ -1854,7 +1866,7 @@ RSpec.describe SchemesController, type: :request do
it "displays page with an error message" do it "displays page with an error message" do
expect(response).to have_http_status(:unprocessable_entity) expect(response).to have_http_status(:unprocessable_entity)
expect(page).to have_content(I18n.t("validations.scheme.deactivation_date.not_entered")) expect(page).to have_content(I18n.t("validations.scheme.deactivation_date.invalid"))
end end
end end
end end

Write Preview
Loading…
Cancel
Save