From 88f96cb0f60858927e6bc0b0f820a3cc3e4aa6dc Mon Sep 17 00:00:00 2001 From: Dombi Attila <83396+dombesz@users.noreply.github.com> Date: Tue, 18 Feb 2025 00:07:58 +0200 Subject: [PATCH] Fix specs --- spec/models/custom_field_spec.rb | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/spec/models/custom_field_spec.rb b/spec/models/custom_field_spec.rb index 88e7f98f98b5..51b4e378f5b6 100644 --- a/spec/models/custom_field_spec.rb +++ b/spec/models/custom_field_spec.rb @@ -289,20 +289,25 @@ end context "for a version custom field" do - let(:versions) { [build_stubbed(:version), build_stubbed(:version)] } + let(:versions) { [build_stubbed(:version, project:), build_stubbed(:version, project:)] } + let(:shared_versions_scope) { instance_double(ActiveRecord::Relation) } before do field.field_format = "version" + allow(shared_versions_scope) + .to receive(:includes) + .with(:project) + .and_return(versions) end context "with a project provided" do it "returns the project's shared_versions" do allow(project) .to receive(:shared_versions) - .and_return(versions) + .and_return(shared_versions_scope) expect(field.possible_values_options(project)) - .to eql(versions.sort.map { |u| [u.name, u.id.to_s] }) + .to eql(versions.sort.map { |u| [u.name, u.id.to_s, project.name] }) end end @@ -312,10 +317,10 @@ it "returns the project's shared_versions" do allow(project) .to receive(:shared_versions) - .and_return(versions) + .and_return(shared_versions_scope) expect(field.possible_values_options(project)) - .to eql(versions.sort.map { |u| [u.name, u.id.to_s] }) + .to eql(versions.sort.map { |u| [u.name, u.id.to_s, project.name] }) end end @@ -323,10 +328,10 @@ it "returns the systemwide versions" do allow(Version) .to receive(:systemwide) - .and_return(versions) + .and_return(shared_versions_scope) expect(field.possible_values_options) - .to eql(versions.sort.map { |u| [u.name, u.id.to_s] }) + .to eql(versions.sort.map { |u| [u.name, u.id.to_s, project.name] }) end end end