Add latest changes from gitlab-org/gitlab@12-10-stable-ee

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb b/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb
index 685abbf7e6c..9f96e5711a4 100644
--- a/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb
+++ b/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb
@@ -19,6 +19,12 @@ describe MergeRequestPollCachedWidgetEntity do
     is_expected.to include(:target_branch_sha)
   end
 
+  it 'has public_merge_status as merge_status' do
+    expect(resource).to receive(:public_merge_status).and_return('checking')
+
+    expect(subject[:merge_status]).to eq 'checking'
+  end
+
   describe 'diverged_commits_count' do
     context 'when MR open and its diverging' do
       it 'returns diverged commits count' do