From dd7461e0c92f83c836e10df19435696535e008f2 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 22 Aug 2024 10:58:05 +0100 Subject: [PATCH] Update test --- spec/requests/merge_requests_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/requests/merge_requests_controller_spec.rb b/spec/requests/merge_requests_controller_spec.rb index 1571c5f98..18d076a9f 100644 --- a/spec/requests/merge_requests_controller_spec.rb +++ b/spec/requests/merge_requests_controller_spec.rb @@ -458,7 +458,7 @@ RSpec.describe MergeRequestsController, type: :request do end describe "#start_merge" do - let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, absorbing_organisation: organisation, merge_date: Time.zone.local(2022, 3, 3)) } + let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, absorbing_organisation: organisation, merge_date: Time.zone.local(2022, 3, 3), existing_absorbing_organisation: true) } let(:merging_organisation) { create(:organisation, name: "Merging Test Org") } before do