Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 2 deletions

diff --git a/spec/serializers/merge_request_user_entity_spec.rb b/spec/serializers/merge_request_user_entity_spec.rb
index 026a229322e..7774c43ab9e 100644
--- a/spec/serializers/merge_request_user_entity_spec.rb
+++ b/spec/serializers/merge_request_user_entity_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe MergeRequestUserEntity do
   let_it_be(:user) { create(:user) }
-  let_it_be(:merge_request) { create(:merge_request) }
+  let_it_be(:merge_request) { create(:merge_request, assignees: [user]) }
 
   let(:request) { EntityRequest.new(project: merge_request.target_project, current_user: user) }
 
@@ -18,7 +18,8 @@ RSpec.describe MergeRequestUserEntity do
     it 'exposes needed attributes' do
       is_expected.to include(
         :id, :name, :username, :state, :avatar_url, :web_url,
-        :can_merge, :can_update_merge_request, :reviewed, :approved
+        :can_merge, :can_update_merge_request, :reviewed, :approved,
+        :attention_required
       )
     end
 
@@ -56,6 +57,10 @@ RSpec.describe MergeRequestUserEntity do
       end
     end
 
+    context 'attention_required' do
+      it { is_expected.to include(attention_required: true ) }
+    end
+
     describe 'performance' do
       let_it_be(:user_a) { create(:user) }
       let_it_be(:user_b) { create(:user) }