Add latest changes from gitlab-org/gitlab@master

1 files changed, 37 insertions, 0 deletions

diff --git a/spec/features/merge_requests/user_lists_merge_requests_spec.rb b/spec/features/merge_requests/user_lists_merge_requests_spec.rb
index 4531ef40901..36d28ae2822 100644
--- a/spec/features/merge_requests/user_lists_merge_requests_spec.rb
+++ b/spec/features/merge_requests/user_lists_merge_requests_spec.rb
@@ -8,6 +8,10 @@ RSpec.describe 'Merge requests > User lists merge requests' do
 
   let(:project) { create(:project, :public, :repository) }
   let(:user) { create(:user) }
+  let(:user2) { create(:user) }
+  let(:user3) { create(:user) }
+  let(:user4) { create(:user) }
+  let(:user5) { create(:user) }
 
   before do
     @fix = create(:merge_request,
@@ -15,6 +19,7 @@ RSpec.describe 'Merge requests > User lists merge requests' do
                   source_project: project,
                   source_branch: 'fix',
                   assignees: [user],
+                  reviewers: [user, user2, user3, user4, user5],
                   milestone: create(:milestone, project: project, due_date: '2013-12-11'),
                   created_at: 1.minute.ago,
                   updated_at: 1.minute.ago)
@@ -23,6 +28,7 @@ RSpec.describe 'Merge requests > User lists merge requests' do
            source_project: project,
            source_branch: 'markdown',
            assignees: [user],
+           reviewers: [user, user2, user3, user4],
            milestone: create(:milestone, project: project, due_date: '2013-12-12'),
            created_at: 2.minutes.ago,
            updated_at: 2.minutes.ago)
@@ -34,6 +40,37 @@ RSpec.describe 'Merge requests > User lists merge requests' do
            updated_at: 10.seconds.ago)
   end
 
+  context 'when merge_request_reviewers is turned on' do
+    before do
+      stub_feature_flags(merge_request_reviewers: true)
+      visit_merge_requests(project, reviewer_id: user.id)
+    end
+
+    it 'has reviewers in MR list' do
+      expect(page).to have_css('.issuable-reviewers')
+    end
+
+    it 'shows reviewers avatar count badge if more_reviewers_count > 4' do
+      first_issuable_reviewers = first('.issuable-reviewers')
+
+      expect(first_issuable_reviewers).to have_content('2')
+      expect(first_issuable_reviewers).to have_css('.avatar-counter')
+    end
+
+    it 'does not show reviewers avatar count badge if more_reviewers_count <= 4' do
+      expect(page.all('.issuable-reviewers')[1]).not_to have_css('.avatar-counter')
+    end
+  end
+
+  context 'when merge_request_reviewers is turned false' do
+    it 'has no reviewers in MR list' do
+      stub_feature_flags(merge_request_reviewers: false)
+      visit_merge_requests(project, reviewer_id: user.id)
+
+      expect(page).not_to have_css('.issuable-reviewers')
+    end
+  end
+
   it 'filters on no assignee' do
     visit_merge_requests(project, assignee_id: IssuableFinder::Params::FILTER_NONE)