Add latest changes from gitlab-org/gitlab@master

1 files changed, 26 insertions, 1 deletions

diff --git a/spec/serializers/merge_request_basic_entity_spec.rb b/spec/serializers/merge_request_basic_entity_spec.rb
index 1cddd87e917..4a8bcd72d9c 100644
--- a/spec/serializers/merge_request_basic_entity_spec.rb
+++ b/spec/serializers/merge_request_basic_entity_spec.rb
@@ -3,7 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe MergeRequestBasicEntity do
-  let(:resource) { build(:merge_request) }
+  let(:resource) { build(:merge_request, params) }
+  let(:params) { {} }
 
   subject do
     described_class.new(resource).as_json
@@ -14,4 +15,28 @@ RSpec.describe MergeRequestBasicEntity do
 
     expect(subject[:merge_status]).to eq 'checking'
   end
+
+  describe '#reviewers' do
+    let(:params) { { reviewers: [reviewer] } }
+    let(:reviewer) { build(:user) }
+
+    context 'when merge_request_reviewers feature is disabled' do
+      it 'does not contain assignees attributes' do
+        stub_feature_flags(merge_request_reviewers: false)
+
+        expect(subject[:reviewers]).to be_nil
+      end
+    end
+
+    context 'when merge_request_reviewers feature is enabled' do
+      it 'contains reviewers attributes' do
+        stub_feature_flags(merge_request_reviewers: true)
+
+        expect(subject[:reviewers].count).to be 1
+        expect(subject[:reviewers].first.keys).to include(
+          :id, :name, :username, :state, :avatar_url, :web_url
+        )
+      end
+    end
+  end
 end