Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 96 insertions, 62 deletions

diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 283d945157b..16ea2989eda 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -28,10 +28,11 @@ RSpec.describe Issue do
     it { is_expected.to have_and_belong_to_many(:prometheus_alert_events) }
     it { is_expected.to have_and_belong_to_many(:self_managed_prometheus_alert_events) }
     it { is_expected.to have_many(:prometheus_alerts) }
+    it { is_expected.to have_many(:issue_email_participants) }
 
     describe 'versions.most_recent' do
       it 'returns the most recent version' do
-        issue = create(:issue)
+        issue = create(:issue, project: reusable_project)
         create_list(:design_version, 2, issue: issue)
         last_version = create(:design_version, issue: issue)
 
@@ -79,19 +80,19 @@ RSpec.describe Issue do
     end
   end
 
-  subject { create(:issue) }
+  subject { create(:issue, project: reusable_project) }
 
   describe 'callbacks' do
     describe '#ensure_metrics' do
       it 'creates metrics after saving' do
-        issue = create(:issue)
+        issue = create(:issue, project: reusable_project)
 
         expect(issue.metrics).to be_persisted
         expect(Issue::Metrics.count).to eq(1)
       end
 
       it 'does not create duplicate metrics for an issue' do
-        issue = create(:issue)
+        issue = create(:issue, project: reusable_project)
 
         issue.close!
 
@@ -102,6 +103,14 @@ RSpec.describe Issue do
       it 'records current metrics' do
         expect_any_instance_of(Issue::Metrics).to receive(:record!)
 
+        create(:issue, project: reusable_project)
+      end
+    end
+
+    describe '#record_create_action' do
+      it 'records the creation action after saving' do
+        expect(Gitlab::UsageDataCounters::IssueActivityUniqueCounter).to receive(:track_issue_created_action)
+
         create(:issue)
       end
     end
@@ -111,8 +120,8 @@ RSpec.describe Issue do
     subject { described_class.with_alert_management_alerts }
 
     it 'gets only issues with alerts' do
-      alert = create(:alert_management_alert, issue: create(:issue))
-      issue = create(:issue)
+      alert = create(:alert_management_alert, project: reusable_project, issue: create(:issue, project: reusable_project))
+      issue = create(:issue, project: reusable_project)
 
       expect(subject).to contain_exactly(alert.issue)
       expect(subject).not_to include(issue)
@@ -130,10 +139,9 @@ RSpec.describe Issue do
   end
 
   describe '.with_issue_type' do
-    let_it_be(:project) { create(:project) }
-    let_it_be(:issue) { create(:issue, project: project) }
-    let_it_be(:incident) { create(:incident, project: project) }
-    let_it_be(:test_case) { create(:quality_test_case, project: project) }
+    let_it_be(:issue) { create(:issue, project: reusable_project) }
+    let_it_be(:incident) { create(:incident, project: reusable_project) }
+    let_it_be(:test_case) { create(:quality_test_case, project: reusable_project) }
 
     it 'gives issues with the given issue type' do
       expect(described_class.with_issue_type('issue'))
@@ -146,6 +154,24 @@ RSpec.describe Issue do
     end
   end
 
+  describe '.order_severity' do
+    let_it_be(:issue_high_severity) { create(:issuable_severity, severity: :high).issue }
+    let_it_be(:issue_low_severity) { create(:issuable_severity, severity: :low).issue }
+    let_it_be(:issue_no_severity) { create(:incident) }
+
+    context 'sorting ascending' do
+      subject { described_class.order_severity_asc }
+
+      it { is_expected.to eq([issue_no_severity, issue_low_severity, issue_high_severity]) }
+    end
+
+    context 'sorting descending' do
+      subject { described_class.order_severity_desc }
+
+      it { is_expected.to eq([issue_high_severity, issue_low_severity, issue_no_severity]) }
+    end
+  end
+
   describe '#order_by_position_and_priority' do
     let(:project) { reusable_project }
     let(:p1) { create(:label, title: 'P1', project: project, priority: 1) }
@@ -195,7 +221,7 @@ RSpec.describe Issue do
   end
 
   describe '#close' do
-    subject(:issue) { create(:issue, state: 'opened') }
+    subject(:issue) { create(:issue, project: reusable_project, state: 'opened') }
 
     it 'sets closed_at to Time.current when an issue is closed' do
       expect { issue.close }.to change { issue.closed_at }.from(nil)
@@ -210,7 +236,7 @@ RSpec.describe Issue do
   end
 
   describe '#reopen' do
-    let(:issue) { create(:issue, state: 'closed', closed_at: Time.current, closed_by: user) }
+    let(:issue) { create(:issue, project: reusable_project, state: 'closed', closed_at: Time.current, closed_by: user) }
 
     it 'sets closed_at to nil when an issue is reopend' do
       expect { issue.reopen }.to change { issue.closed_at }.to(nil)
@@ -293,7 +319,7 @@ RSpec.describe Issue do
   end
 
   describe '#assignee_or_author?' do
-    let(:issue) { create(:issue) }
+    let(:issue) { create(:issue, project: reusable_project) }
 
     it 'returns true for a user that is assigned to an issue' do
       issue.assignees << user
@@ -313,22 +339,21 @@ RSpec.describe Issue do
   end
 
   describe '#related_issues' do
-    let(:user) { create(:user) }
-    let(:authorized_project) { create(:project) }
-    let(:authorized_project2) { create(:project) }
-    let(:unauthorized_project) { create(:project) }
+    let_it_be(:authorized_project) { create(:project) }
+    let_it_be(:authorized_project2) { create(:project) }
+    let_it_be(:unauthorized_project) { create(:project) }
 
-    let(:authorized_issue_a) { create(:issue, project: authorized_project) }
-    let(:authorized_issue_b) { create(:issue, project: authorized_project) }
-    let(:authorized_issue_c) { create(:issue, project: authorized_project2) }
+    let_it_be(:authorized_issue_a) { create(:issue, project: authorized_project) }
+    let_it_be(:authorized_issue_b) { create(:issue, project: authorized_project) }
+    let_it_be(:authorized_issue_c) { create(:issue, project: authorized_project2) }
 
-    let(:unauthorized_issue) { create(:issue, project: unauthorized_project) }
+    let_it_be(:unauthorized_issue) { create(:issue, project: unauthorized_project) }
 
-    let!(:issue_link_a) { create(:issue_link, source: authorized_issue_a, target: authorized_issue_b) }
-    let!(:issue_link_b) { create(:issue_link, source: authorized_issue_a, target: unauthorized_issue) }
-    let!(:issue_link_c) { create(:issue_link, source: authorized_issue_a, target: authorized_issue_c) }
+    let_it_be(:issue_link_a) { create(:issue_link, source: authorized_issue_a, target: authorized_issue_b) }
+    let_it_be(:issue_link_b) { create(:issue_link, source: authorized_issue_a, target: unauthorized_issue) }
+    let_it_be(:issue_link_c) { create(:issue_link, source: authorized_issue_a, target: authorized_issue_c) }
 
-    before do
+    before_all do
       authorized_project.add_developer(user)
       authorized_project2.add_developer(user)
     end
@@ -366,17 +391,16 @@ RSpec.describe Issue do
     end
 
     context 'user is reporter in project issue belongs to' do
-      let(:project) { create(:project) }
-      let(:issue) { create(:issue, project: project) }
+      let(:issue) { create(:issue, project: reusable_project) }
 
-      before do
-        project.add_reporter(user)
+      before_all do
+        reusable_project.add_reporter(user)
       end
 
       it { is_expected.to eq true }
 
       context 'issue not persisted' do
-        let(:issue) { build(:issue, project: project) }
+        let(:issue) { build(:issue, project: reusable_project) }
 
         it { is_expected.to eq false }
       end
@@ -384,7 +408,7 @@ RSpec.describe Issue do
       context 'checking destination project also' do
         subject { issue.can_move?(user, to_project) }
 
-        let(:to_project) { create(:project) }
+        let_it_be(:to_project) { create(:project) }
 
         context 'destination project allowed' do
           before do
@@ -420,7 +444,7 @@ RSpec.describe Issue do
   end
 
   describe '#duplicated?' do
-    let(:issue) { create(:issue) }
+    let(:issue) { create(:issue, project: reusable_project) }
 
     subject { issue.duplicated? }
 
@@ -429,7 +453,7 @@ RSpec.describe Issue do
     end
 
     context 'issue already duplicated' do
-      let(:duplicated_to_issue) { create(:issue) }
+      let(:duplicated_to_issue) { create(:issue, project: reusable_project) }
       let(:issue) { create(:issue, duplicated_to: duplicated_to_issue) }
 
       it { is_expected.to eq true }
@@ -440,13 +464,13 @@ RSpec.describe Issue do
     subject { issue.from_service_desk? }
 
     context 'when issue author is support bot' do
-      let(:issue) { create(:issue, author: ::User.support_bot) }
+      let(:issue) { create(:issue, project: reusable_project, author: ::User.support_bot) }
 
       it { is_expected.to be_truthy }
     end
 
     context 'when issue author is not support bot' do
-      let(:issue) { create(:issue) }
+      let(:issue) { create(:issue, project: reusable_project) }
 
       it { is_expected.to be_falsey }
     end
@@ -495,7 +519,7 @@ RSpec.describe Issue do
   end
 
   describe '#has_related_branch?' do
-    let(:issue) { create(:issue, title: "Blue Bell Knoll") }
+    let(:issue) { create(:issue, project: reusable_project, title: "Blue Bell Knoll") }
 
     subject { issue.has_related_branch? }
 
@@ -528,7 +552,7 @@ RSpec.describe Issue do
   end
 
   describe "#to_branch_name" do
-    let(:issue) { create(:issue, title: 'testing-issue') }
+    let_it_be(:issue) { create(:issue, project: reusable_project, title: 'testing-issue') }
 
     it 'starts with the issue iid' do
       expect(issue.to_branch_name).to match(/\A#{issue.iid}-[A-Za-z\-]+\z/)
@@ -539,12 +563,12 @@ RSpec.describe Issue do
     end
 
     it "does not contain the issue title if confidential" do
-      issue = create(:issue, title: 'testing-issue', confidential: true)
+      issue = create(:issue, project: reusable_project, title: 'testing-issue', confidential: true)
       expect(issue.to_branch_name).to match(/confidential-issue\z/)
     end
 
     context 'issue title longer than 100 characters' do
-      let(:issue) { create(:issue, iid: 999, title: 'Lorem ipsum dolor sit amet consectetur adipiscing elit Mauris sit amet ipsum id lacus custom fringilla convallis') }
+      let_it_be(:issue) { create(:issue, project: reusable_project, iid: 999, title: 'Lorem ipsum dolor sit amet consectetur adipiscing elit Mauris sit amet ipsum id lacus custom fringilla convallis') }
 
       it "truncates branch name to at most 100 characters" do
         expect(issue.to_branch_name.length).to be <= 100
@@ -581,15 +605,14 @@ RSpec.describe Issue do
 
   describe '#participants' do
     context 'using a public project' do
-      let(:project) { create(:project, :public) }
-      let(:issue) { create(:issue, project: project) }
+      let_it_be(:issue) { create(:issue, project: reusable_project) }
 
       let!(:note1) do
-        create(:note_on_issue, noteable: issue, project: project, note: 'a')
+        create(:note_on_issue, noteable: issue, project: reusable_project, note: 'a')
       end
 
       let!(:note2) do
-        create(:note_on_issue, noteable: issue, project: project, note: 'b')
+        create(:note_on_issue, noteable: issue, project: reusable_project, note: 'b')
       end
 
       it 'includes the issue author' do
@@ -604,8 +627,8 @@ RSpec.describe Issue do
     context 'using a private project' do
       it 'does not include mentioned users that do not have access to the project' do
         project = create(:project)
-        user = create(:user)
         issue = create(:issue, project: project)
+        user = create(:user)
 
         create(:note_on_issue,
                noteable: issue,
@@ -621,10 +644,9 @@ RSpec.describe Issue do
     it 'updates when assignees change' do
       user1 = create(:user)
       user2 = create(:user)
-      project = create(:project)
-      issue = create(:issue, assignees: [user1], project: project)
-      project.add_developer(user1)
-      project.add_developer(user2)
+      issue = create(:issue, assignees: [user1], project: reusable_project)
+      reusable_project.add_developer(user1)
+      reusable_project.add_developer(user2)
 
       expect(user1.assigned_open_issues_count).to eq(1)
       expect(user2.assigned_open_issues_count).to eq(0)
@@ -638,9 +660,8 @@ RSpec.describe Issue do
   end
 
   describe '#visible_to_user?' do
-    let(:project) { build(:project) }
+    let(:project) { reusable_project }
     let(:issue)   { build(:issue, project: project) }
-    let(:user)    { create(:user) }
 
     subject { issue.visible_to_user?(user) }
 
@@ -661,6 +682,10 @@ RSpec.describe Issue do
     context 'without a user' do
       let(:user) { nil }
 
+      before do
+        project.project_feature.update_attribute(:issues_access_level, ProjectFeature::PUBLIC)
+      end
+
       it 'returns true when the issue is publicly visible' do
         expect(issue).to receive(:publicly_visible?).and_return(true)
 
@@ -995,7 +1020,8 @@ RSpec.describe Issue do
 
     with_them do
       it 'checks for spam on issues that can be seen anonymously' do
-        project = create(:project, visibility_level: visibility_level)
+        project = reusable_project
+        project.update(visibility_level: visibility_level)
         issue = create(:issue, project: project, confidential: confidential, description: 'original description')
 
         issue.assign_attributes(new_attributes)
@@ -1016,8 +1042,8 @@ RSpec.describe Issue do
 
   describe '.public_only' do
     it 'only returns public issues' do
-      public_issue = create(:issue)
-      create(:issue, confidential: true)
+      public_issue = create(:issue, project: reusable_project)
+      create(:issue, project: reusable_project, confidential: true)
 
       expect(described_class.public_only).to eq([public_issue])
     end
@@ -1025,15 +1051,15 @@ RSpec.describe Issue do
 
   describe '.confidential_only' do
     it 'only returns confidential_only issues' do
-      create(:issue)
-      confidential_issue = create(:issue, confidential: true)
+      create(:issue, project: reusable_project)
+      confidential_issue = create(:issue, project: reusable_project, confidential: true)
 
       expect(described_class.confidential_only).to eq([confidential_issue])
     end
   end
 
   describe '.by_project_id_and_iid' do
-    let_it_be(:issue_a) { create(:issue) }
+    let_it_be(:issue_a) { create(:issue, project: reusable_project) }
     let_it_be(:issue_b) { create(:issue, iid: issue_a.iid) }
     let_it_be(:issue_c) { create(:issue, project: issue_a.project) }
     let_it_be(:issue_d) { create(:issue, project: issue_a.project) }
@@ -1050,8 +1076,8 @@ RSpec.describe Issue do
 
   describe '.service_desk' do
     it 'returns the service desk issue' do
-      service_desk_issue = create(:issue, author: ::User.support_bot)
-      regular_issue = create(:issue)
+      service_desk_issue = create(:issue, project: reusable_project, author: ::User.support_bot)
+      regular_issue = create(:issue, project: reusable_project)
 
       expect(described_class.service_desk).to include(service_desk_issue)
       expect(described_class.service_desk).not_to include(regular_issue)
@@ -1064,7 +1090,7 @@ RSpec.describe Issue do
 
   describe "#labels_hook_attrs" do
     let(:label) { create(:label) }
-    let(:issue) { create(:labeled_issue, labels: [label]) }
+    let(:issue) { create(:labeled_issue, project: reusable_project, labels: [label]) }
 
     it "returns a list of label hook attributes" do
       expect(issue.labels_hook_attrs).to eq([label.hook_attrs])
@@ -1073,7 +1099,7 @@ RSpec.describe Issue do
 
   context "relative positioning" do
     it_behaves_like "a class that supports relative positioning" do
-      let_it_be(:project) { create(:project) }
+      let_it_be(:project) { reusable_project }
       let(:factory) { :issue }
       let(:default_params) { { project: project } }
     end
@@ -1083,7 +1109,7 @@ RSpec.describe Issue do
 
   describe "#previous_updated_at" do
     let_it_be(:updated_at) { Time.zone.local(2012, 01, 06) }
-    let_it_be(:issue) { create(:issue, updated_at: updated_at) }
+    let_it_be(:issue) { create(:issue, project: reusable_project, updated_at: updated_at) }
 
     it 'returns updated_at value if updated_at did not change at all' do
       allow(issue).to receive(:previous_changes).and_return({})
@@ -1121,7 +1147,7 @@ RSpec.describe Issue do
   end
 
   describe 'current designs' do
-    let(:issue) { create(:issue) }
+    let(:issue) { create(:issue, project: reusable_project) }
 
     subject { issue.designs.current }
 
@@ -1213,4 +1239,12 @@ RSpec.describe Issue do
       expect(issue.allows_reviewers?).to be(false)
     end
   end
+
+  describe '#issue_type_supports?' do
+    let_it_be(:issue) { create(:issue) }
+
+    it 'raises error when feature is invalid' do
+      expect { issue.issue_type_supports?(:unkown_feature) }.to raise_error(ArgumentError)
+    end
+  end
 end