From c2c82b83ec95ae4a6198fa00b2c4d5edc21c4ae0 Mon Sep 17 00:00:00 2001 From: Samuel Date: Tue, 20 May 2025 16:57:56 +0100 Subject: [PATCH] update tests --- .../form/lettings/questions/created_by_id_spec.rb | 14 ++++++++++++-- .../form/sales/questions/created_by_id_spec.rb | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/spec/models/form/lettings/questions/created_by_id_spec.rb b/spec/models/form/lettings/questions/created_by_id_spec.rb index 1cae12396..8d27f4b48 100644 --- a/spec/models/form/lettings/questions/created_by_id_spec.rb +++ b/spec/models/form/lettings/questions/created_by_id_spec.rb @@ -74,7 +74,7 @@ RSpec.describe Form::Lettings::Questions::CreatedById, type: :model do let(:user_in_same_org) { create(:user, organisation: data_coordinator.organisation) } it "only displays users that belong user's org" do - expect(question.displayed_answer_options(lettings_log, data_coordinator)).to eq(expected_option_for_users(data_coordinator.organisation.users)) + expect(question.displayed_answer_options(lettings_log, data_coordinator)).to eq(expected_option_for_users(data_coordinator.organisation.users.active_status)) end context "when organisation has deleted users" do @@ -83,7 +83,17 @@ RSpec.describe Form::Lettings::Questions::CreatedById, type: :model do end it "does not display deleted users" do - expect(question.displayed_answer_options(lettings_log, data_coordinator)).to eq(expected_option_for_users(data_coordinator.organisation.users.visible)) + expect(question.displayed_answer_options(lettings_log, data_coordinator)).to eq(expected_option_for_users(data_coordinator.organisation.users.visible.active_status)) + end + end + + context "when organisation has inactive users" do + before do + create(:user, name: "Inactive user", active: false, organisation: data_coordinator.organisation) + end + + it "does not display deleted users" do + expect(question.displayed_answer_options(lettings_log, data_coordinator)).to eq(expected_option_for_users(data_coordinator.organisation.users.visible.active_status)) end end end diff --git a/spec/models/form/sales/questions/created_by_id_spec.rb b/spec/models/form/sales/questions/created_by_id_spec.rb index 0c21a21c8..5fb0e6dda 100644 --- a/spec/models/form/sales/questions/created_by_id_spec.rb +++ b/spec/models/form/sales/questions/created_by_id_spec.rb @@ -74,7 +74,7 @@ RSpec.describe Form::Sales::Questions::CreatedById, type: :model do end it "only displays users that belong to managing organisation" do - expect(question.displayed_answer_options(sales_log, data_coordinator)).to eq(expected_option_for_users(owning_org_user.organisation.users)) + expect(question.displayed_answer_options(sales_log, data_coordinator)).to eq(expected_option_for_users(owning_org_user.organisation.users.active_status)) end context "when organisation has deleted users" do @@ -83,7 +83,17 @@ RSpec.describe Form::Sales::Questions::CreatedById, type: :model do end it "does not display deleted users" do - expect(question.displayed_answer_options(sales_log, data_coordinator)).to eq(expected_option_for_users(owning_org_user.organisation.users.visible)) + expect(question.displayed_answer_options(sales_log, data_coordinator)).to eq(expected_option_for_users(owning_org_user.organisation.users.visible.active_status)) + end + end + + context "when organisation has inactive users" do + before do + create(:user, name: "Inactive user", active: false, organisation: data_coordinator.organisation) + end + + it "does not display inactive users" do + expect(question.displayed_answer_options(sales_log, data_coordinator)).to eq(expected_option_for_users(data_coordinator.organisation.users.visible.active_status)) end end end