Browse Source

Update test

pull/2600/head
Kat 2 years ago committed by kosiakkatrina
parent
commit
dd7461e0c9
  1. 2
      spec/requests/merge_requests_controller_spec.rb

2
spec/requests/merge_requests_controller_spec.rb

@ -458,7 +458,7 @@ RSpec.describe MergeRequestsController, type: :request do
end end
describe "#start_merge" do 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") } let(:merging_organisation) { create(:organisation, name: "Merging Test Org") }
before do before do

Loading…
Cancel
Save