- <%= f.govuk_text_field :helpdesk_ticket, caption: { text: "Ticket number", class: "govuk-label govuk-label--s" }, label: { text: "For example, MSD-12345", class: "app-!-colour-muted" } %>
+ <%= f.govuk_radio_buttons_fieldset :has_helpdesk_ticket,
+ legend: { text: "Was this merge reported by a helpdesk ticket?", size: "l" } do %>
+
+ <%= f.govuk_radio_button "has_helpdesk_ticket",
+ true,
+ label: { text: "Yes" },
+ **basic_conditional_html_attributes({ "helpdesk_ticket" => [true] }, "merge_request") do %>
+ <%= f.govuk_text_field :helpdesk_ticket,
+ caption: { text: "Ticket number", class: "govuk-label govuk-label--s" },
+ label: { text: "For example, MSD-12345", class: "app-!-colour-muted" } %>
+ <% end %>
+
+ <%= f.govuk_radio_button "has_helpdesk_ticket",
+ false,
+ label: { text: "No" } %>
+ <% end %>
+
<%= f.hidden_field :page, value: "helpdesk_ticket" %>
<%= f.govuk_submit submit_merge_request_button_text(request.query_parameters["referrer"]) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 698618717..80711129e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -188,6 +188,10 @@ en:
blank: "You must answer absorbing organisation already active?"
merging_organisation_id:
part_of_another_merge: "Another merge request records %{organisation} as merging into %{absorbing_organisation} on %{merge_date}. Select another organisation or remove this organisation from the other merge request."
+ has_helpdesk_ticket:
+ blank: "You must answer was this merge reported by a helpdesk ticket?"
+ helpdesk_ticket:
+ blank: "You must answer the ticket number"
notification:
attributes:
title:
diff --git a/config/locales/forms/2023/sales/soft_validations.en.yml b/config/locales/forms/2023/sales/soft_validations.en.yml
index 0303063df..f86a7d2ed 100644
--- a/config/locales/forms/2023/sales/soft_validations.en.yml
+++ b/config/locales/forms/2023/sales/soft_validations.en.yml
@@ -37,11 +37,11 @@ en:
check_answer_prompt: ""
hint_text: ""
question_text: "Are you sure this is correct?"
- min:
+ ecstat:
page_header: ""
title_text: "You told us income was %{income}."
informative_text: "This is less than we would expect for someone in this working situation."
- max:
+ discounted:
page_header: ""
title_text: "You told us the income of buyer 1 is %{income}. This seems high. Are you sure this is correct?"
@@ -50,11 +50,11 @@ en:
check_answer_prompt: ""
hint_text: ""
question_text: "Are you sure this is correct?"
- min:
+ ecstat:
page_header: ""
title_text: "You told us income was %{income}."
informative_text: "This is less than we would expect for someone in this working situation."
- max:
+ discounted:
page_header: ""
title_text: "You told us the income of buyer 2 is %{income}. This seems high. Are you sure this is correct?"
diff --git a/config/locales/forms/2024/sales/soft_validations.en.yml b/config/locales/forms/2024/sales/soft_validations.en.yml
index bfb30269e..0418aa515 100644
--- a/config/locales/forms/2024/sales/soft_validations.en.yml
+++ b/config/locales/forms/2024/sales/soft_validations.en.yml
@@ -35,11 +35,11 @@ en:
check_answer_prompt: ""
hint_text: ""
question_text: "Are you sure this is correct?"
- min:
+ ecstat:
page_header: ""
title_text: "You told us income was %{income}."
- informative_text: "This is less than we would expect for someone in this working situation."
- max:
+ informative_text: "This is %{more_or_less} than we would expect for someone in this working situation."
+ discounted:
page_header: ""
title_text: "You told us the income of buyer 1 is %{income}. This seems high. Are you sure this is correct?"
@@ -48,11 +48,11 @@ en:
check_answer_prompt: ""
hint_text: ""
question_text: "Are you sure this is correct?"
- min:
+ ecstat:
page_header: ""
title_text: "You told us income was %{income}."
- informative_text: "This is less than we would expect for someone in this working situation."
- max:
+ informative_text: "This is %{more_or_less} than we would expect for someone in this working situation."
+ discounted:
page_header: ""
title_text: "You told us the income of buyer 2 is %{income}. This seems high. Are you sure this is correct?"
diff --git a/config/locales/forms/2025/sales/soft_validations.en.yml b/config/locales/forms/2025/sales/soft_validations.en.yml
index ef8d9dfec..7ec48239e 100644
--- a/config/locales/forms/2025/sales/soft_validations.en.yml
+++ b/config/locales/forms/2025/sales/soft_validations.en.yml
@@ -35,26 +35,26 @@ en:
check_answer_prompt: ""
hint_text: ""
question_text: "Are you sure this is correct?"
- min:
+ ecstat:
page_header: ""
- title_text: "You told us income was %{income}."
- informative_text: "This is less than we would expect for someone in this working situation."
- max:
+ title_text: "You told us the income of buyer 1 is %{income}."
+ informative_text: "This is %{more_or_less} than we would expect for someone in this working situation."
+ discounted:
page_header: ""
- title_text: "You told us the income of buyer 1 is %{income}. This seems high. Are you sure this is correct?"
+ title_text: "You told us the income of buyer 1 is %{income}. This seems high for this sale type. Are you sure this is correct?"
income2_value_check:
check_answer_label: "Buyer 2 income confirmation"
check_answer_prompt: ""
hint_text: ""
question_text: "Are you sure this is correct?"
- min:
+ ecstat:
page_header: ""
- title_text: "You told us income was %{income}."
- informative_text: "This is less than we would expect for someone in this working situation."
- max:
+ title_text: "You told us the income of buyer 2 is %{income}."
+ informative_text: "This is %{more_or_less} than we would expect for someone in this working situation."
+ discounted:
page_header: ""
- title_text: "You told us the income of buyer 2 is %{income}. This seems high. Are you sure this is correct?"
+ title_text: "You told us the income of buyer 2 is %{income}. This seems high for this sale type. Are you sure this is correct?"
combined_income_value_check:
page_header: ""
@@ -62,7 +62,7 @@ en:
check_answer_prompt: ""
hint_text: ""
question_text: "Are you sure this is correct?"
- title_text: "You told us the combined income of this household is %{combined_income}. This seems high. Are you sure this is correct?"
+ title_text: "You told us the combined income of this household is %{combined_income}. This seems high for this sale type. Are you sure this is correct?"
mortgage_value_check:
page_header: ""
diff --git a/db/migrate/20241122154743_add_has_helpdest_ticket.rb b/db/migrate/20241122154743_add_has_helpdest_ticket.rb
new file mode 100644
index 000000000..103611ad8
--- /dev/null
+++ b/db/migrate/20241122154743_add_has_helpdest_ticket.rb
@@ -0,0 +1,5 @@
+class AddHasHelpdestTicket < ActiveRecord::Migration[7.0]
+ def change
+ add_column :merge_requests, :has_helpdesk_ticket, :boolean
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9aa744dc2..c53872020 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.0].define(version: 2024_11_18_104046) do
+ActiveRecord::Schema[7.0].define(version: 2024_11_22_154743) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -478,6 +478,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_11_18_104046) do
t.boolean "request_merged"
t.boolean "processing"
t.boolean "existing_absorbing_organisation"
+ t.boolean "has_helpdesk_ticket"
end
create_table "notifications", force: :cascade do |t|
diff --git a/lib/tasks/count_duplicates.rake b/lib/tasks/count_duplicates.rake
index e65688b4d..76cd1d991 100644
--- a/lib/tasks/count_duplicates.rake
+++ b/lib/tasks/count_duplicates.rake
@@ -60,4 +60,66 @@ namespace :count_duplicates do
url = storage_service.get_presigned_url(filename, 72.hours.to_i)
Rails.logger.info("Download URL: #{url}")
end
+
+ desc "Count the number of duplicate active schemes per organisation"
+ task active_scheme_duplicates_per_org: :environment do
+ duplicates_csv = CSV.generate(headers: true) do |csv|
+ csv << ["Organisation id", "Number of duplicate sets", "Total duplicate schemes"]
+
+ Organisation.visible.each do |organisation|
+ if organisation.owned_schemes.duplicate_active_sets.count.positive?
+ csv << [organisation.id, organisation.owned_schemes.duplicate_active_sets.count, organisation.owned_schemes.duplicate_active_sets.sum(&:size)]
+ end
+ end
+ end
+
+ filename = "active-scheme-duplicates-#{Time.zone.now}.csv"
+ storage_service = Storage::S3Service.new(Configuration::EnvConfigurationService.new, ENV["BULK_UPLOAD_BUCKET"])
+ storage_service.write_file(filename, "#{duplicates_csv}")
+
+ url = storage_service.get_presigned_url(filename, 72.hours.to_i)
+ Rails.logger.info("Download URL: #{url}")
+ end
+
+ desc "Count the number of duplicate active locations per organisation"
+ task active_location_duplicates_per_org: :environment do
+ duplicates_csv = CSV.generate(headers: true) do |csv|
+ csv << ["Organisation id", "Duplicate sets within individual schemes", "Duplicate locations within individual schemes", "All duplicate sets", "All duplicates"]
+
+ Organisation.visible.each do |organisation|
+ duplicate_sets_within_individual_schemes = []
+
+ organisation.owned_schemes.each do |scheme|
+ duplicate_sets_within_individual_schemes += scheme.locations.duplicate_active_sets
+ end
+ duplicate_locations_within_individual_schemes = duplicate_sets_within_individual_schemes.flatten
+
+ duplicate_sets_within_duplicate_schemes = []
+ if organisation.owned_schemes.duplicate_active_sets.count.positive?
+ organisation.owned_schemes.duplicate_active_sets.each do |duplicate_set|
+ duplicate_sets_within_duplicate_schemes += Location.where(scheme_id: duplicate_set).duplicate_active_sets_within_given_schemes
+ end
+ duplicate_locations_within_duplicate_schemes_ids = duplicate_sets_within_duplicate_schemes.flatten
+
+ duplicate_sets_within_individual_schemes_without_intersecting_sets = duplicate_sets_within_individual_schemes.reject { |set| set.any? { |id| duplicate_sets_within_duplicate_schemes.any? { |duplicate_set| duplicate_set.include?(id) } } }
+ all_duplicate_sets_count = (duplicate_sets_within_individual_schemes_without_intersecting_sets + duplicate_sets_within_duplicate_schemes).count
+ all_duplicate_locations_count = (duplicate_locations_within_duplicate_schemes_ids + duplicate_locations_within_individual_schemes).uniq.count
+ else
+ all_duplicate_sets_count = duplicate_sets_within_individual_schemes.count
+ all_duplicate_locations_count = duplicate_locations_within_individual_schemes.count
+ end
+
+ if all_duplicate_locations_count.positive?
+ csv << [organisation.id, duplicate_sets_within_individual_schemes.count, duplicate_locations_within_individual_schemes.count, all_duplicate_sets_count, all_duplicate_locations_count]
+ end
+ end
+ end
+
+ filename = "active-location-duplicates-#{Time.zone.now}.csv"
+ storage_service = Storage::S3Service.new(Configuration::EnvConfigurationService.new, ENV["BULK_UPLOAD_BUCKET"])
+ storage_service.write_file(filename, "#{duplicates_csv}")
+
+ url = storage_service.get_presigned_url(filename, 72.hours.to_i)
+ Rails.logger.info("Download URL: #{url}")
+ end
end
diff --git a/spec/factories/merge_request.rb b/spec/factories/merge_request.rb
index 19020fce1..4b33e4002 100644
--- a/spec/factories/merge_request.rb
+++ b/spec/factories/merge_request.rb
@@ -2,6 +2,7 @@ FactoryBot.define do
factory :merge_request do
status { "incomplete" }
merge_date { nil }
+ has_helpdesk_ticket { true }
helpdesk_ticket { "MSD-99999" }
association :requesting_organisation, factory: :organisation
end
diff --git a/spec/factories/scheme.rb b/spec/factories/scheme.rb
index 34f98a8a6..e7ecc8b60 100644
--- a/spec/factories/scheme.rb
+++ b/spec/factories/scheme.rb
@@ -44,5 +44,10 @@ FactoryBot.define do
trait :created_now do
created_at { Time.zone.now }
end
+ trait :with_location do
+ after(:create) do |scheme|
+ create(:location, scheme:)
+ end
+ end
end
end
diff --git a/spec/helpers/tag_helper_spec.rb b/spec/helpers/tag_helper_spec.rb
index 231323278..1a6c75724 100644
--- a/spec/helpers/tag_helper_spec.rb
+++ b/spec/helpers/tag_helper_spec.rb
@@ -10,8 +10,8 @@ RSpec.describe TagHelper do
end
it "returns tag with correct status text and colour and custom class" do
- expect(status_tag("not_started", "app-tag--small")).to eq("Not started")
- expect(status_tag("cannot_start_yet", "app-tag--small")).to eq("Cannot start yet")
+ expect(status_tag("not_started", "app-tag--small")).to eq("Not started")
+ expect(status_tag("cannot_start_yet", "app-tag--small")).to eq(nil)
expect(status_tag("in_progress", "app-tag--small")).to eq("In progress")
expect(status_tag("completed", "app-tag--small")).to eq("Completed")
expect(status_tag("active", "app-tag--small")).to eq("Active")
diff --git a/spec/lib/tasks/count_duplicates_spec.rb b/spec/lib/tasks/count_duplicates_spec.rb
index 99da5b2fb..b4f6a8db8 100644
--- a/spec/lib/tasks/count_duplicates_spec.rb
+++ b/spec/lib/tasks/count_duplicates_spec.rb
@@ -108,4 +108,114 @@ RSpec.describe "count_duplicates" do
end
end
end
+
+ describe "count_duplicates:active_scheme_duplicates_per_org", type: :task do
+ subject(:task) { Rake::Task["count_duplicates:active_scheme_duplicates_per_org"] }
+
+ let(:storage_service) { instance_double(Storage::S3Service) }
+ let(:test_url) { "test_url" }
+
+ before do
+ Rake.application.rake_require("tasks/count_duplicates")
+ Rake::Task.define_task(:environment)
+ task.reenable
+ end
+
+ context "when the rake task is run" do
+ context "and there are no duplicate schemes" do
+ before do
+ create(:organisation)
+ end
+
+ it "creates a csv with headers only" do
+ expect(storage_service).to receive(:write_file).with(/scheme-duplicates-.*\.csv/, "\uFEFFOrganisation id,Number of duplicate sets,Total duplicate schemes\n")
+ expect(Rails.logger).to receive(:info).with("Download URL: #{test_url}")
+ task.invoke
+ end
+ end
+
+ context "and there are duplicate schemes" do
+ let(:organisation) { create(:organisation) }
+ let(:organisation2) { create(:organisation) }
+
+ before do
+ create_list(:scheme, 2, :duplicate, :with_location, owning_organisation: organisation)
+ create_list(:scheme, 3, :duplicate, :with_location, primary_client_group: "I", owning_organisation: organisation)
+ create_list(:scheme, 5, :duplicate, :with_location, owning_organisation: organisation2)
+ deactivated_schemes = create_list(:scheme, 2, :duplicate, owning_organisation: organisation)
+ deactivated_schemes.each do |scheme|
+ create(:scheme_deactivation_period, deactivation_date: Time.zone.yesterday, reactivation_date: nil, scheme:)
+ end
+ end
+
+ it "creates a csv with correct duplicate numbers" do
+ expect(storage_service).to receive(:write_file).with(/scheme-duplicates-.*\.csv/, "\uFEFFOrganisation id,Number of duplicate sets,Total duplicate schemes\n#{organisation.id},2,5\n#{organisation2.id},1,5\n")
+ expect(Rails.logger).to receive(:info).with("Download URL: #{test_url}")
+ task.invoke
+ end
+ end
+ end
+ end
+
+ describe "count_duplicates:active_location_duplicates_per_org", type: :task do
+ subject(:task) { Rake::Task["count_duplicates:active_location_duplicates_per_org"] }
+
+ let(:storage_service) { instance_double(Storage::S3Service) }
+ let(:test_url) { "test_url" }
+
+ before do
+ Rake.application.rake_require("tasks/count_duplicates")
+ Rake::Task.define_task(:environment)
+ task.reenable
+ end
+
+ context "when the rake task is run" do
+ context "and there are no duplicate locations" do
+ before do
+ create(:organisation)
+ end
+
+ it "creates a csv with headers only" do
+ expect(storage_service).to receive(:write_file).with(/location-duplicates-.*\.csv/, "\uFEFFOrganisation id,Duplicate sets within individual schemes,Duplicate locations within individual schemes,All duplicate sets,All duplicates\n")
+ expect(Rails.logger).to receive(:info).with("Download URL: #{test_url}")
+ task.invoke
+ end
+ end
+
+ context "and there are duplicate locations" do
+ let(:organisation) { create(:organisation) }
+ let(:scheme_a) { create(:scheme, :duplicate, owning_organisation: organisation) }
+ let(:scheme_b) { create(:scheme, :duplicate, owning_organisation: organisation) }
+ let(:scheme_c) { create(:scheme, owning_organisation: organisation) }
+ let(:organisation2) { create(:organisation) }
+ let(:scheme2) { create(:scheme, owning_organisation: organisation2) }
+ let(:scheme3) { create(:scheme, owning_organisation: organisation2) }
+
+ before do
+ create_list(:location, 2, postcode: "A1 1AB", mobility_type: "M", scheme: scheme_a) # Location A
+ create_list(:location, 1, postcode: "A1 1AB", mobility_type: "A", scheme: scheme_a) # Location B
+
+ create_list(:location, 1, postcode: "A1 1AB", mobility_type: "M", scheme: scheme_b) # Location A
+ create_list(:location, 1, postcode: "A1 1AB", mobility_type: "A", scheme: scheme_b) # Location B
+ create_list(:location, 2, postcode: "A1 1AB", mobility_type: "N", scheme: scheme_b) # Location C
+
+ create_list(:location, 2, postcode: "A1 1AB", mobility_type: "A", scheme: scheme_c) # Location B
+
+ create_list(:location, 5, postcode: "A1 1AB", mobility_type: "M", scheme: scheme2)
+ create_list(:location, 2, postcode: "A1 1AB", mobility_type: "M", scheme: scheme3)
+
+ deactivated_locations = create_list(:location, 1, postcode: "A1 1AB", mobility_type: "M", scheme: scheme_b)
+ deactivated_locations.each do |location|
+ create(:location_deactivation_period, deactivation_date: Time.zone.yesterday, reactivation_date: nil, location:)
+ end
+ end
+
+ it "creates a csv with correct duplicate numbers" do
+ expect(storage_service).to receive(:write_file).with(/location-duplicates-.*\.csv/, "\uFEFFOrganisation id,Duplicate sets within individual schemes,Duplicate locations within individual schemes,All duplicate sets,All duplicates\n#{organisation.id},3,6,4,9\n#{organisation2.id},2,7,2,7\n")
+ expect(Rails.logger).to receive(:info).with("Download URL: #{test_url}")
+ task.invoke
+ end
+ end
+ end
+ end
end
diff --git a/spec/models/form/sales/pages/buyer1_income_max_value_check_spec.rb b/spec/models/form/sales/pages/buyer1_income_discounted_max_value_check_spec.rb
similarity index 84%
rename from spec/models/form/sales/pages/buyer1_income_max_value_check_spec.rb
rename to spec/models/form/sales/pages/buyer1_income_discounted_max_value_check_spec.rb
index fa5cf1e7c..2282a9535 100644
--- a/spec/models/form/sales/pages/buyer1_income_max_value_check_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_income_discounted_max_value_check_spec.rb
@@ -1,6 +1,6 @@
require "rails_helper"
-RSpec.describe Form::Sales::Pages::Buyer1IncomeMaxValueCheck, type: :model do
+RSpec.describe Form::Sales::Pages::Buyer1IncomeDiscountedMaxValueCheck, type: :model do
subject(:page) { described_class.new(page_id, page_definition, subsection, check_answers_card_number: 1) }
let(:page_id) { "prefix_buyer_1_income_max_value_check" }
@@ -23,7 +23,7 @@ RSpec.describe Form::Sales::Pages::Buyer1IncomeMaxValueCheck, type: :model do
it "has correct depends_on" do
expect(page.depends_on).to eq([
{
- "income1_over_soft_max?" => true,
+ "income1_over_soft_max_for_discounted_ownership?" => true,
},
])
end
diff --git a/spec/models/form/sales/pages/buyer1_income_min_value_check_spec.rb b/spec/models/form/sales/pages/buyer1_income_ecstat_value_check_spec.rb
similarity index 75%
rename from spec/models/form/sales/pages/buyer1_income_min_value_check_spec.rb
rename to spec/models/form/sales/pages/buyer1_income_ecstat_value_check_spec.rb
index 79d61ce06..9d710aebb 100644
--- a/spec/models/form/sales/pages/buyer1_income_min_value_check_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_income_ecstat_value_check_spec.rb
@@ -1,9 +1,9 @@
require "rails_helper"
-RSpec.describe Form::Sales::Pages::Buyer1IncomeMinValueCheck, type: :model do
+RSpec.describe Form::Sales::Pages::Buyer1IncomeEcstatValueCheck, type: :model do
subject(:page) { described_class.new(page_id, page_definition, subsection) }
- let(:page_id) { "prefix_buyer_1_income_min_value_check" }
+ let(:page_id) { "prefix_buyer_1_income_ecstat_value_check" }
let(:page_definition) { nil }
let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
let(:subsection) { instance_double(Form::Subsection, form:) }
@@ -17,13 +17,13 @@ RSpec.describe Form::Sales::Pages::Buyer1IncomeMinValueCheck, type: :model do
end
it "has the correct id" do
- expect(page.id).to eq("prefix_buyer_1_income_min_value_check")
+ expect(page.id).to eq("prefix_buyer_1_income_ecstat_value_check")
end
it "has correct depends_on" do
expect(page.depends_on).to eq([
{
- "income1_under_soft_min?" => true,
+ "income1_outside_soft_range_for_ecstat?" => true,
},
])
end
diff --git a/spec/models/form/sales/pages/buyer2_income_max_value_check_spec.rb b/spec/models/form/sales/pages/buyer2_income_discounted_max_value_check_spec.rb
similarity index 84%
rename from spec/models/form/sales/pages/buyer2_income_max_value_check_spec.rb
rename to spec/models/form/sales/pages/buyer2_income_discounted_max_value_check_spec.rb
index f467db18d..36a04cedb 100644
--- a/spec/models/form/sales/pages/buyer2_income_max_value_check_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_income_discounted_max_value_check_spec.rb
@@ -1,6 +1,6 @@
require "rails_helper"
-RSpec.describe Form::Sales::Pages::Buyer2IncomeMaxValueCheck, type: :model do
+RSpec.describe Form::Sales::Pages::Buyer2IncomeDiscountedMaxValueCheck, type: :model do
subject(:page) { described_class.new(page_id, page_definition, subsection, check_answers_card_number: 2) }
let(:page_id) { "prefix_buyer_2_income_max_value_check" }
@@ -23,7 +23,7 @@ RSpec.describe Form::Sales::Pages::Buyer2IncomeMaxValueCheck, type: :model do
it "has correct depends_on" do
expect(page.depends_on).to eq([
{
- "income2_over_soft_max?" => true,
+ "income2_over_soft_max_for_discounted_ownership?" => true,
},
])
end
diff --git a/spec/models/form/sales/pages/buyer2_income_min_value_check_spec.rb b/spec/models/form/sales/pages/buyer2_income_ecstat_value_check_spec.rb
similarity index 72%
rename from spec/models/form/sales/pages/buyer2_income_min_value_check_spec.rb
rename to spec/models/form/sales/pages/buyer2_income_ecstat_value_check_spec.rb
index 44b85ef9e..2ced58f17 100644
--- a/spec/models/form/sales/pages/buyer2_income_min_value_check_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_income_ecstat_value_check_spec.rb
@@ -1,9 +1,9 @@
require "rails_helper"
-RSpec.describe Form::Sales::Pages::Buyer2IncomeMinValueCheck, type: :model do
+RSpec.describe Form::Sales::Pages::Buyer2IncomeEcstatValueCheck, type: :model do
subject(:page) { described_class.new(page_id, page_definition, subsection) }
- let(:page_id) { "prefix_buyer_2_income_min_value_check" }
+ let(:page_id) { "prefix_buyer_2_income_ecstat_value_check" }
let(:page_definition) { nil }
let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
let(:subsection) { instance_double(Form::Subsection, form:) }
@@ -17,13 +17,13 @@ RSpec.describe Form::Sales::Pages::Buyer2IncomeMinValueCheck, type: :model do
end
it "has the correct id" do
- expect(page.id).to eq("prefix_buyer_2_income_min_value_check")
+ expect(page.id).to eq("prefix_buyer_2_income_ecstat_value_check")
end
it "has correct depends_on" do
expect(page.depends_on).to eq([
{
- "income2_under_soft_min?" => true,
+ "income2_outside_soft_range_for_ecstat?" => true,
},
])
end
diff --git a/spec/models/form/sales/pages/combined_income_max_value_check_spec.rb b/spec/models/form/sales/pages/combined_income_max_value_check_spec.rb
index f9b9954d9..85dd29c5c 100644
--- a/spec/models/form/sales/pages/combined_income_max_value_check_spec.rb
+++ b/spec/models/form/sales/pages/combined_income_max_value_check_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Form::Sales::Pages::CombinedIncomeMaxValueCheck, type: :model do
it "has correct depends_on" do
expect(page.depends_on).to eq([
{
- "combined_income_over_soft_max?" => true,
+ "combined_income_over_soft_max_for_discounted_ownership?" => true,
},
])
end
diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb
index 3cd856eb3..d892febc4 100644
--- a/spec/models/form/sales/subsections/household_characteristics_spec.rb
+++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb
@@ -16,116 +16,6 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
expect(household_characteristics.section).to eq(section)
end
- it "has the correct id" do
- expect(household_characteristics.id).to eq("household_characteristics")
- end
-
- it "has the correct label" do
- expect(household_characteristics.label).to eq("Household characteristics")
- end
-
- context "with 2022/23 form" do
- before do
- allow(form).to receive(:start_date).and_return(Time.zone.local(2022, 4, 1))
- allow(form).to receive(:start_year_2024_or_later?).and_return(false)
- allow(form).to receive(:start_year_2025_or_later?).and_return(false)
- end
-
- it "has correct pages" do
- expect(household_characteristics.pages.map(&:id)).to eq(
- %w[
- buyer_interview_joint_purchase
- buyer_interview
- privacy_notice_joint_purchase
- privacy_notice
- buyer_1_age
- age_1_retirement_value_check
- age_1_old_persons_shared_ownership_joint_purchase_value_check
- age_1_old_persons_shared_ownership_value_check
- buyer_1_gender_identity
- buyer_1_ethnic_group
- buyer_1_ethnic_background_black
- buyer_1_ethnic_background_asian
- buyer_1_ethnic_background_arab
- buyer_1_ethnic_background_mixed
- buyer_1_ethnic_background_white
- buyer_1_nationality
- buyer_1_working_situation
- working_situation_1_retirement_value_check
- working_situation_buyer_1_income_min_value_check
- buyer_1_live_in_property
- buyer_1_live_in_property_value_check
- buyer_2_relationship_to_buyer_1
- buyer_2_relationship_student_not_child_value_check
- buyer_2_age
- age_2_old_persons_shared_ownership_joint_purchase_value_check
- age_2_old_persons_shared_ownership_value_check
- age_2_buyer_retirement_value_check
- buyer_2_age_student_not_child_value_check
- buyer_2_gender_identity
- buyer_2_working_situation
- working_situation_2_retirement_value_check_joint_purchase
- working_situation_buyer_2_income_min_value_check
- buyer_2_working_situation_student_not_child_value_check
- buyer_2_live_in_property
- buyer_2_live_in_property_value_check
- number_of_others_in_property
- number_of_others_in_property_joint_purchase
- person_2_known
- person_2_relationship_to_buyer_1
- relationship_2_student_not_child_value_check
- person_2_age
- age_2_retirement_value_check
- age_2_student_not_child_value_check
- person_2_gender_identity
- person_2_working_situation
- working_situation_2_retirement_value_check
- working_situation_2_student_not_child_value_check
- person_3_known
- person_3_relationship_to_buyer_1
- relationship_3_student_not_child_value_check
- person_3_age
- age_3_retirement_value_check
- age_3_student_not_child_value_check
- person_3_gender_identity
- person_3_working_situation
- working_situation_3_retirement_value_check
- working_situation_3_student_not_child_value_check
- person_4_known
- person_4_relationship_to_buyer_1
- relationship_4_student_not_child_value_check
- person_4_age
- age_4_retirement_value_check
- age_4_student_not_child_value_check
- person_4_gender_identity
- person_4_working_situation
- working_situation_4_retirement_value_check
- working_situation_4_student_not_child_value_check
- person_5_known
- person_5_relationship_to_buyer_1
- relationship_5_student_not_child_value_check
- person_5_age
- age_5_retirement_value_check
- age_5_student_not_child_value_check
- person_5_gender_identity
- person_5_working_situation
- working_situation_5_retirement_value_check
- working_situation_5_student_not_child_value_check
- person_6_known
- person_6_relationship_to_buyer_1
- relationship_6_student_not_child_value_check
- person_6_age
- age_6_retirement_value_check
- age_6_student_not_child_value_check
- person_6_gender_identity
- person_6_working_situation
- working_situation_6_retirement_value_check
- working_situation_6_student_not_child_value_check
- ],
- )
- end
- end
-
context "with 2023/24 form" do
before do
allow(form).to receive(:start_date).and_return(Time.zone.local(2023, 4, 1))
@@ -154,7 +44,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
buyer_1_nationality
buyer_1_working_situation
working_situation_1_retirement_value_check
- working_situation_buyer_1_income_min_value_check
+ working_situation_buyer_1_income_value_check
buyer_1_live_in_property
buyer_1_live_in_property_value_check
buyer_2_relationship_to_buyer_1
@@ -174,7 +64,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
buyer_2_nationality
buyer_2_working_situation
working_situation_2_retirement_value_check_joint_purchase
- working_situation_buyer_2_income_min_value_check
+ working_situation_buyer_2_income_value_check
buyer_2_working_situation_student_not_child_value_check
buyer_2_live_in_property
buyer_2_live_in_property_value_check
@@ -281,7 +171,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
buyer_1_working_situation
working_situation_1_retirement_value_check
working_situation_1_not_retired_value_check
- working_situation_buyer_1_income_min_value_check
+ working_situation_buyer_1_income_value_check
buyer_1_live_in_property
buyer_1_live_in_property_value_check
buyer_2_relationship_to_buyer_1
@@ -303,7 +193,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
buyer_2_working_situation
working_situation_2_retirement_value_check_joint_purchase
working_situation_2_not_retired_value_check_joint_purchase
- working_situation_buyer_2_income_min_value_check
+ working_situation_buyer_2_income_value_check
buyer_2_working_situation_student_not_child_value_check
buyer_2_live_in_property
buyer_2_live_in_property_value_check
@@ -396,10 +286,6 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
allow(form).to receive(:start_year_2025_or_later?).and_return(true)
end
- it "has correct depends on" do
- expect(household_characteristics.depends_on).to eq([{ "setup_completed?" => true }])
- end
-
it "has correct pages" do
expect(household_characteristics.pages.map(&:id)).to eq(
%w[
@@ -419,7 +305,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
buyer_1_working_situation
working_situation_1_retirement_value_check
working_situation_1_not_retired_value_check
- working_situation_buyer_1_income_min_value_check
+ working_situation_buyer_1_income_value_check
buyer_1_live_in_property
buyer_1_live_in_property_value_check
buyer_2_relationship_to_buyer_1
@@ -441,7 +327,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
buyer_2_working_situation
working_situation_2_retirement_value_check_joint_purchase
working_situation_2_not_retired_value_check_joint_purchase
- working_situation_buyer_2_income_min_value_check
+ working_situation_buyer_2_income_value_check
buyer_2_working_situation_student_not_child_value_check
buyer_2_live_in_property
buyer_2_live_in_property_value_check
@@ -525,5 +411,9 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
],
)
end
+
+ it "has correct depends on" do
+ expect(household_characteristics.depends_on).to eq([{ "setup_completed?" => true }])
+ end
end
end
diff --git a/spec/models/form/sales/subsections/income_benefits_and_savings_spec.rb b/spec/models/form/sales/subsections/income_benefits_and_savings_spec.rb
index 557155758..e6c46a119 100644
--- a/spec/models/form/sales/subsections/income_benefits_and_savings_spec.rb
+++ b/spec/models/form/sales/subsections/income_benefits_and_savings_spec.rb
@@ -5,7 +5,8 @@ RSpec.describe Form::Sales::Subsections::IncomeBenefitsAndSavings, type: :model
let(:subsection_id) { nil }
let(:subsection_definition) { nil }
- let(:section) { instance_double(Form::Sales::Sections::Household) }
+ let(:section) { instance_double(Form::Sales::Sections::Household, form:) }
+ let(:form) { instance_double(Form, start_date: Time.utc(2024, 4, 1), start_year_2025_or_later?: false) }
it "has correct section" do
expect(subsection.section).to eq(section)
@@ -19,88 +20,80 @@ RSpec.describe Form::Sales::Subsections::IncomeBenefitsAndSavings, type: :model
expect(subsection.label).to eq("Income, benefits and savings")
end
- describe "pages" do
- let(:section) { instance_double(Form::Sales::Sections::Household, form: instance_double(Form, start_date:, start_year_2025_or_later?: false)) }
+ context "when before 2025" do
+ let(:form) { instance_double(Form, start_date: Time.utc(2024, 4, 1), start_year_2025_or_later?: false) }
- context "when 2022" do
- let(:start_date) { Time.utc(2022, 2, 8) }
-
- it "has correct pages" do
- expect(subsection.pages.compact.map(&:id)).to eq(
- %w[
- buyer_1_income
- buyer_1_income_min_value_check
- buyer_1_income_max_value_check
- buyer_1_combined_income_max_value_check
- buyer_1_income_mortgage_value_check
- buyer_1_mortgage
- buyer_1_mortgage_value_check
- buyer_2_income
- buyer_2_income_mortgage_value_check
- buyer_2_income_min_value_check
- buyer_2_income_max_value_check
- buyer_2_combined_income_max_value_check
- buyer_2_mortgage
- buyer_2_mortgage_value_check
- housing_benefits_joint_purchase
- housing_benefits_not_joint_purchase
- savings_joint_purchase
- savings
- savings_joint_purchase_value_check
- savings_value_check
- savings_deposit_joint_purchase_value_check
- savings_deposit_value_check
- previous_ownership_joint_purchase
- previous_ownership_not_joint_purchase
- ],
- )
- end
+ it "has correct pages" do
+ expect(subsection.pages.map(&:id)).to eq(
+ %w[
+ buyer_1_income
+ buyer_1_income_ecstat_value_check
+ buyer_1_income_discounted_max_value_check
+ buyer_1_combined_income_max_value_check
+ buyer_1_income_mortgage_value_check
+ buyer_1_mortgage
+ buyer_1_mortgage_value_check
+ buyer_2_income
+ buyer_2_income_mortgage_value_check
+ buyer_2_income_ecstat_value_check
+ buyer_2_income_discounted_max_value_check
+ buyer_2_combined_income_max_value_check
+ buyer_2_mortgage
+ buyer_2_mortgage_value_check
+ housing_benefits_joint_purchase
+ housing_benefits_not_joint_purchase
+ savings_joint_purchase
+ savings
+ savings_joint_purchase_value_check
+ savings_value_check
+ savings_deposit_joint_purchase_value_check
+ savings_deposit_value_check
+ previous_ownership_joint_purchase
+ previous_ownership_not_joint_purchase
+ previous_shared
+ ],
+ )
end
- context "when 2023" do
- let(:start_date) { Time.utc(2023, 2, 8) }
-
- it "has correct pages" do
- expect(subsection.pages.map(&:id)).to eq(
- %w[
- buyer_1_income
- buyer_1_income_min_value_check
- buyer_1_income_max_value_check
- buyer_1_combined_income_max_value_check
- buyer_1_income_mortgage_value_check
- buyer_1_mortgage
- buyer_1_mortgage_value_check
- buyer_2_income
- buyer_2_income_mortgage_value_check
- buyer_2_income_min_value_check
- buyer_2_income_max_value_check
- buyer_2_combined_income_max_value_check
- buyer_2_mortgage
- buyer_2_mortgage_value_check
- housing_benefits_joint_purchase
- housing_benefits_not_joint_purchase
- savings_joint_purchase
- savings
- savings_joint_purchase_value_check
- savings_value_check
- savings_deposit_joint_purchase_value_check
- savings_deposit_value_check
- previous_ownership_joint_purchase
- previous_ownership_not_joint_purchase
- previous_shared
- ],
- )
- end
-
- it "has correct depends on" do
- expect(subsection.depends_on).to eq([{ "setup_completed?" => true }])
- end
+ it "has correct depends on" do
+ expect(subsection.depends_on).to eq([{ "setup_completed?" => true }])
end
end
context "when 2025" do
- let(:start_date) { Time.utc(2025, 2, 8) }
- let(:section) { instance_double(Form::Sales::Sections::Household, form: instance_double(Form, start_date:, start_year_2025_or_later?: true)) }
+ let(:form) { instance_double(Form, start_date: Time.utc(2025, 4, 1), start_year_2025_or_later?: true) }
+
+ it "has correct pages" do
+ expect(subsection.pages.map(&:id)).to eq(
+ %w[
+ buyer_1_income
+ buyer_1_income_ecstat_value_check
+ buyer_1_income_discounted_max_value_check
+ buyer_1_combined_income_max_value_check
+ buyer_1_income_mortgage_value_check
+ buyer_1_mortgage
+ buyer_1_mortgage_value_check
+ buyer_2_income
+ buyer_2_income_mortgage_value_check
+ buyer_2_income_ecstat_value_check
+ buyer_2_income_discounted_max_value_check
+ buyer_2_combined_income_max_value_check
+ buyer_2_mortgage
+ buyer_2_mortgage_value_check
+ housing_benefits_joint_purchase
+ housing_benefits_not_joint_purchase
+ savings_joint_purchase
+ savings
+ savings_joint_purchase_value_check
+ savings_value_check
+ savings_deposit_joint_purchase_value_check
+ savings_deposit_value_check
+ previous_ownership_joint_purchase
+ previous_ownership_not_joint_purchase
+ previous_shared
+ ],
+ )
+ end
it "has correct depends on" do
expect(subsection.depends_on).to eq([{ "setup_completed?" => true, "is_staircase?" => false }])
diff --git a/spec/models/validations/sales/soft_validations_spec.rb b/spec/models/validations/sales/soft_validations_spec.rb
index 99c615250..51f0d695a 100644
--- a/spec/models/validations/sales/soft_validations_spec.rb
+++ b/spec/models/validations/sales/soft_validations_spec.rb
@@ -3,85 +3,222 @@ require "rails_helper"
RSpec.describe Validations::Sales::SoftValidations do
let(:record) { build(:sales_log) }
- describe "income1 min validations" do
- context "when validating soft min" do
- it "returns false if no income1 is given" do
+ describe "income validations" do
+ context "when validating soft range based on ecstat" do
+ it "does not trigger for income1 if no income1 is given" do
record.income1 = nil
-
- expect(record).not_to be_income1_under_soft_min
+ expect(record).not_to be_income1_outside_soft_range_for_ecstat
end
- it "returns false if no ecstat1 is given" do
+ it "does not trigger for low income1 if no ecstat1 is given" do
+ record.income1 = 50
record.ecstat1 = nil
+ expect(record).not_to be_income1_outside_soft_range_for_ecstat
+ end
- expect(record).not_to be_income1_under_soft_min
+ it "does not trigger for income2 if no income2 is given" do
+ record.income2 = nil
+ expect(record).not_to be_income2_outside_soft_range_for_ecstat
end
- [
- {
- income1: 4500,
- ecstat1: 1,
- },
- {
- income1: 1400,
- ecstat1: 2,
- },
- {
- income1: 999,
- ecstat1: 3,
- },
- {
- income1: 1899,
- ecstat1: 5,
- },
- {
- income1: 1888,
- ecstat1: 0,
- },
- ].each do |test_case|
- it "returns true if income1 is below soft min for ecstat1 #{test_case[:ecstat1]}" do
- record.income1 = test_case[:income1]
- record.ecstat1 = test_case[:ecstat1]
- expect(record)
- .to be_income1_under_soft_min
+ it "does not trigger for low income2 if no ecstat2 is given" do
+ record.income2 = 50
+ record.ecstat2 = nil
+ expect(record).not_to be_income2_outside_soft_range_for_ecstat
+ end
+
+ context "when log year is before 2025" do
+ let(:record) { build(:sales_log, saledate: Time.zone.local(2024, 12, 25)) }
+
+ it "does not trigger for low income1 if ecstat1 has no soft min" do
+ record.income1 = 50
+ record.ecstat1 = 4
+ expect(record).not_to be_income1_outside_soft_range_for_ecstat
+ end
+
+ it "returns true if income1 is below soft min for ecstat1" do
+ record.income1 = 4500
+ record.ecstat1 = 1
+ expect(record).to be_income1_outside_soft_range_for_ecstat
+ end
+
+ it "returns false if income1 is >= soft min for ecstat1" do
+ record.income1 = 1500
+ record.ecstat1 = 2
+ expect(record).not_to be_income1_outside_soft_range_for_ecstat
+ end
+
+ it "does not trigger for income2 if ecstat2 has no soft min" do
+ record.income2 = 50
+ record.ecstat2 = 8
+ expect(record).not_to be_income2_outside_soft_range_for_ecstat
+ end
+
+ it "returns true if income2 is below soft min for ecstat2" do
+ record.income2 = 999
+ record.ecstat2 = 3
+ expect(record).to be_income2_outside_soft_range_for_ecstat
+ end
+
+ it "returns false if income2 is >= soft min for ecstat2" do
+ record.income2 = 2500
+ record.ecstat2 = 5
+ expect(record).not_to be_income2_outside_soft_range_for_ecstat
+ end
+
+ it "does not trigger for being over maxima" do
+ record.ecstat1 = 1
+ record.income1 = 200_000
+ record.ecstat2 = 2
+ record.income2 = 100_000
+ expect(record).not_to be_income1_outside_soft_range_for_ecstat
+ expect(record).not_to be_income2_outside_soft_range_for_ecstat
end
end
- [
- {
- income1: 5001,
- ecstat1: 1,
- },
- {
- income1: 1600,
- ecstat1: 2,
- },
- {
- income1: 1004,
- ecstat1: 3,
- },
- {
- income1: 2899,
- ecstat1: 4,
- },
- {
- income1: 2899,
- ecstat1: 5,
- },
- {
- income1: 5,
- ecstat1: 6,
- },
- {
- income1: 10_888,
- ecstat1: 0,
- },
- ].each do |test_case|
- it "returns false if income1 is over soft min for ecstat1 #{test_case[:ecstat1]}" do
- record.income1 = test_case[:income1]
- record.ecstat1 = test_case[:ecstat1]
- expect(record)
- .not_to be_income1_under_soft_min
+ context "when log year is 2025" do
+ let(:record) { build(:sales_log, saledate: Time.zone.local(2025, 12, 25)) }
+
+ it "returns true if income1 is below soft min for ecstat1" do
+ record.income1 = 13_399
+ record.ecstat1 = 1
+ expect(record).to be_income1_outside_soft_range_for_ecstat
+ end
+
+ it "returns false if income1 is >= soft min for ecstat1" do
+ record.income1 = 2600
+ record.ecstat1 = 2
+ expect(record).not_to be_income1_outside_soft_range_for_ecstat
+ end
+
+ it "returns true if income2 is below soft min for ecstat2" do
+ record.income2 = 2079
+ record.ecstat2 = 3
+ expect(record).to be_income2_outside_soft_range_for_ecstat
+ end
+
+ it "returns false if income2 is >= soft min for ecstat2" do
+ record.income2 = 520
+ record.ecstat2 = 5
+ expect(record).not_to be_income2_outside_soft_range_for_ecstat
+ end
+
+ it "returns true if income1 is above soft max for ecstat1" do
+ record.income1 = 80_001
+ record.ecstat1 = 2
+ expect(record).to be_income1_outside_soft_range_for_ecstat
+ end
+
+ it "returns false if income1 is <= soft max for ecstat1" do
+ record.income1 = 80_000
+ record.ecstat1 = 2
+ expect(record).not_to be_income1_outside_soft_range_for_ecstat
+ end
+
+ it "returns true if income2 is above soft max for ecstat2" do
+ record.income2 = 50_001
+ record.ecstat2 = 6
+ expect(record).to be_income2_outside_soft_range_for_ecstat
+ end
+
+ it "returns false if income2 is <= soft max for ecstat2" do
+ record.income2 = 50_000
+ record.ecstat2 = 6
+ expect(record).not_to be_income2_outside_soft_range_for_ecstat
+ end
+ end
+ end
+
+ context "when validating soft max for discounted ownership" do
+ it "does not trigger if la is not set" do
+ record.la = nil
+ record.income1 = 100_000
+ record.income2 = 95_000
+ record.ownershipsch = 2
+ expect(record).not_to be_income1_over_soft_max_for_discounted_ownership
+ expect(record).not_to be_income2_over_soft_max_for_discounted_ownership
+ expect(record).not_to be_combined_income_over_soft_max_for_discounted_ownership
+ end
+
+ it "does not trigger if sale is not discounted ownership" do
+ record.la = "E09000001"
+ record.income1 = 100_000
+ record.income2 = 95_000
+ record.ownershipsch = 1
+ expect(record).not_to be_income1_over_soft_max_for_discounted_ownership
+ expect(record).not_to be_income2_over_soft_max_for_discounted_ownership
+ expect(record).not_to be_combined_income_over_soft_max_for_discounted_ownership
+ end
+
+ context "when property is in London for a discounted ownership sale" do
+ let(:record) { build(:sales_log, ownershipsch: 2, la: "E09000001") }
+
+ it "returns true for income1 if income1 > London threshold" do
+ record.income1 = 90_001
+ expect(record).to be_income1_over_soft_max_for_discounted_ownership
+ end
+
+ it "returns false for income1 if income1 <= London threshold" do
+ record.income1 = 90_000
+ expect(record).not_to be_income1_over_soft_max_for_discounted_ownership
+ end
+
+ it "returns true for income2 if income2 > London threshold" do
+ record.income2 = 100_000
+ expect(record).to be_income2_over_soft_max_for_discounted_ownership
+ end
+
+ it "returns false for income2 if income2 <= London threshold" do
+ record.income2 = 30_000
+ expect(record).not_to be_income2_over_soft_max_for_discounted_ownership
+ end
+
+ it "returns true for combined income if > London threshold" do
+ record.income1 = 61_000
+ record.income2 = 30_000
+ expect(record).to be_combined_income_over_soft_max_for_discounted_ownership
+ end
+
+ it "returns false for combined income if <= London threshold" do
+ record.income1 = 40_000
+ record.income2 = 20_000
+ expect(record).not_to be_combined_income_over_soft_max_for_discounted_ownership
+ end
+ end
+
+ context "when property is not in London for a discounted ownership sale" do
+ let(:record) { build(:sales_log, ownershipsch: 2, la: "E08000001") }
+
+ it "returns true for income1 if income1 > non-London threshold" do
+ record.income1 = 80_001
+ expect(record).to be_income1_over_soft_max_for_discounted_ownership
+ end
+
+ it "returns false for income1 if income1 <= non-London threshold" do
+ record.income1 = 80_000
+ expect(record).not_to be_income1_over_soft_max_for_discounted_ownership
+ end
+
+ it "returns true for income2 if income2 > non-London threshold" do
+ record.income2 = 85_000
+ expect(record).to be_income2_over_soft_max_for_discounted_ownership
+ end
+
+ it "returns false for income2 if income2 <= non-London threshold" do
+ record.income2 = 30_000
+ expect(record).not_to be_income2_over_soft_max_for_discounted_ownership
+ end
+
+ it "returns true for combined income if > non-London threshold" do
+ record.income1 = 61_000
+ record.income2 = 20_000
+ expect(record).to be_combined_income_over_soft_max_for_discounted_ownership
+ end
+
+ it "returns false for combined income if <= non-London threshold" do
+ record.income1 = 40_000
+ record.income2 = 20_000
+ expect(record).not_to be_combined_income_over_soft_max_for_discounted_ownership
end
end
end
diff --git a/spec/requests/merge_requests_controller_spec.rb b/spec/requests/merge_requests_controller_spec.rb
index 2e2488b93..074d2186c 100644
--- a/spec/requests/merge_requests_controller_spec.rb
+++ b/spec/requests/merge_requests_controller_spec.rb
@@ -260,7 +260,7 @@ RSpec.describe MergeRequestsController, type: :request do
end
it "shows the correct content" do
- expect(page).to have_content("Which helpdesk ticket reported this merge?")
+ expect(page).to have_content("Was this merge reported by a helpdesk ticket?")
expect(page).to have_link("Back", href: existing_absorbing_organisation_merge_request_path(merge_request))
expect(page).to have_button("Save and continue")
end
@@ -476,6 +476,82 @@ RSpec.describe MergeRequestsController, type: :request do
end
end
end
+
+ describe "from helpdesk_ticket page" do
+ context "when not answering the question" do
+ let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, absorbing_organisation: other_organisation) }
+ let(:params) do
+ { merge_request: { page: "helpdesk_ticket" } }
+ end
+ let(:request) do
+ patch "/merge-request/#{merge_request.id}", headers:, params:
+ end
+
+ it "renders the error" do
+ request
+
+ expect(response).to have_http_status(:unprocessable_entity)
+ expect(page).to have_content("You must answer was this merge reported by a helpdesk ticket?")
+ end
+
+ it "does not update the request" do
+ expect { request }.not_to(change { merge_request.reload.attributes })
+ end
+ end
+
+ context "when has_helpdesk_ticket is true but no ticket is given" do
+ let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, absorbing_organisation: other_organisation) }
+ let(:params) do
+ { merge_request: { page: "helpdesk_ticket", has_helpdesk_ticket: true } }
+ end
+ let(:request) do
+ patch "/merge-request/#{merge_request.id}", headers:, params:
+ end
+
+ it "renders the error" do
+ request
+
+ expect(response).to have_http_status(:unprocessable_entity)
+ expect(page).to have_content("You must answer the ticket number")
+ end
+
+ it "does not update the request" do
+ expect { request }.not_to(change { merge_request.reload.attributes })
+ end
+ end
+
+ context "when has_helpdesk_ticket is false" do
+ let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, absorbing_organisation: other_organisation, helpdesk_ticket: "123") }
+ let(:params) do
+ { merge_request: { page: "helpdesk_ticket", has_helpdesk_ticket: false } }
+ end
+ let(:request) do
+ patch "/merge-request/#{merge_request.id}", headers:, params:
+ end
+
+ it "updates has_helpdesk_ticket and clears helpdesk_ticket" do
+ request
+ expect(merge_request.reload.has_helpdesk_ticket).to eq(false)
+ expect(merge_request.helpdesk_ticket).to eq(nil)
+ end
+ end
+
+ context "when has_helpdesk_ticket is true and ticket is given" do
+ let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, absorbing_organisation: other_organisation) }
+ let(:params) do
+ { merge_request: { page: "helpdesk_ticket", has_helpdesk_ticket: true, helpdesk_ticket: "321" } }
+ end
+ let(:request) do
+ patch "/merge-request/#{merge_request.id}", headers:, params:
+ end
+
+ it "updates has_helpdesk_ticket and clears helpdesk_ticket" do
+ request
+ expect(merge_request.reload.has_helpdesk_ticket).to eq(true)
+ expect(merge_request.helpdesk_ticket).to eq("321")
+ end
+ end
+ end
end
describe "#merge_start_confirmation" do
diff --git a/spec/services/documentation_generator_spec.rb b/spec/services/documentation_generator_spec.rb
index 6f4714d01..d214aaa9e 100644
--- a/spec/services/documentation_generator_spec.rb
+++ b/spec/services/documentation_generator_spec.rb
@@ -127,11 +127,11 @@ describe DocumentationGenerator do
context "when the service is run for sales" do
let(:log_type) { "sales" }
- let(:all_validation_methods) { ["income2_under_soft_min?"] }
+ let(:all_validation_methods) { ["income2_outside_soft_range_for_ecstat?"] }
it "creates new validation documentation records" do
expect { described_class.new.describe_soft_validations(client, all_validation_methods, all_helper_methods, log_type) }.to change(LogValidation, :count)
- expect(LogValidation.where(validation_name: "income2_under_soft_min?").count).to be_positive
+ expect(LogValidation.where(validation_name: "income2_outside_soft_range_for_ecstat?").count).to be_positive
any_validation = LogValidation.first
expect(any_validation.description).to eq("Validates the format.")
expect(any_validation.field).not_to be_empty