diff options
Diffstat (limited to 'spec/models/concerns/issuable_spec.rb')
-rw-r--r-- | spec/models/concerns/issuable_spec.rb | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb index 206b3ae61cf..e11c7e98287 100644 --- a/spec/models/concerns/issuable_spec.rb +++ b/spec/models/concerns/issuable_spec.rb @@ -150,8 +150,10 @@ RSpec.describe Issuable do end it 'gives preference to state_id if present' do - issuable = MergeRequest.new('state' => 'opened', - 'state_id' => described_class::STATE_ID_MAP['merged']) + issuable = MergeRequest.new( + 'state' => 'opened', + 'state_id' => described_class::STATE_ID_MAP['merged'] + ) expect(issuable.state).to eq('merged') expect(issuable.state_id).to eq(described_class::STATE_ID_MAP['merged']) @@ -858,22 +860,16 @@ RSpec.describe Issuable do end end - describe '#first_contribution?' do + describe '#first_contribution?', feature_category: :code_review_workflow do let(:group) { create(:group) } let(:project) { create(:project, namespace: group) } let(:other_project) { create(:project) } - let(:owner) { create(:owner) } - let(:maintainer) { create(:user) } - let(:reporter) { create(:user) } let(:guest) { create(:user) } let(:contributor) { create(:user) } let(:first_time_contributor) { create(:user) } before do - group.add_owner(owner) - project.add_maintainer(maintainer) - project.add_reporter(reporter) project.add_guest(guest) project.add_guest(contributor) project.add_guest(first_time_contributor) @@ -884,24 +880,6 @@ RSpec.describe Issuable do let(:merged_mr_other_project) { create(:merge_request, :merged, author: first_time_contributor, target_project: other_project, source_project: other_project) } context "for merge requests" do - it "is false for MAINTAINER" do - mr = create(:merge_request, author: maintainer, target_project: project, source_project: project) - - expect(mr).not_to be_first_contribution - end - - it "is false for OWNER" do - mr = create(:merge_request, author: owner, target_project: project, source_project: project) - - expect(mr).not_to be_first_contribution - end - - it "is false for REPORTER" do - mr = create(:merge_request, author: reporter, target_project: project, source_project: project) - - expect(mr).not_to be_first_contribution - end - it "is true when you don't have any merged MR" do expect(open_mr).to be_first_contribution expect(merged_mr).not_to be_first_contribution @@ -998,7 +976,7 @@ RSpec.describe Issuable do end end - describe '#incident?' do + describe '#incident_type_issue?' do where(:issuable_type, :incident) do :issue | false :incident | true @@ -1008,7 +986,7 @@ RSpec.describe Issuable do with_them do let(:issuable) { build_stubbed(issuable_type) } - subject { issuable.incident? } + subject { issuable.incident_type_issue? } it { is_expected.to eq(incident) } end |