Browse Source

Return correct status when existing_absorbing_organisation is false (#2617)

pull/2619/head
kosiakkatrina 2 years ago committed by GitHub
parent
commit
3228e87e78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      app/models/merge_request.rb
  2. 6
      spec/models/merge_request_spec.rb

2
app/models/merge_request.rb

@ -47,7 +47,7 @@ class MergeRequest < ApplicationRecord
def required_questions_answered? def required_questions_answered?
absorbing_organisation_id.present? && absorbing_organisation_id.present? &&
merge_date.present? && merge_date.present? &&
existing_absorbing_organisation.present? && !existing_absorbing_organisation.nil? &&
merging_organisations.count.positive? && merging_organisations.count.positive? &&
errors.empty? errors.empty?
end end

6
spec/models/merge_request_spec.rb

@ -60,6 +60,12 @@ RSpec.describe MergeRequest, type: :model do
expect(merge_request.status).to eq MergeRequest::STATUS[:ready_to_merge] expect(merge_request.status).to eq MergeRequest::STATUS[:ready_to_merge]
end end
it "returns the correct status for a ready to merge request when existing_absorbing_organisation is false" do
merge_request = build(:merge_request, id: 1, absorbing_organisation: create(:organisation), merge_date: Time.zone.today, existing_absorbing_organisation: false)
create(:merge_request_organisation, merge_request:)
expect(merge_request.status).to eq MergeRequest::STATUS[:ready_to_merge]
end
it "returns the merge issues if dsa is not signed for absorbing organisation" do it "returns the merge issues if dsa is not signed for absorbing organisation" do
merge_request = build(:merge_request, id: 1, absorbing_organisation: create(:organisation, with_dsa: false), merge_date: Time.zone.today, existing_absorbing_organisation: true) merge_request = build(:merge_request, id: 1, absorbing_organisation: create(:organisation, with_dsa: false), merge_date: Time.zone.today, existing_absorbing_organisation: true)
create(:merge_request_organisation, merge_request:) create(:merge_request_organisation, merge_request:)

Loading…
Cancel
Save