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

1 files changed, 17 insertions, 0 deletions

diff --git a/spec/serializers/merge_request_basic_entity_spec.rb b/spec/serializers/merge_request_basic_entity_spec.rb
new file mode 100644
index 00000000000..53ba66a79ac
--- /dev/null
+++ b/spec/serializers/merge_request_basic_entity_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe MergeRequestBasicEntity do
+  let(:resource) { build(:merge_request) }
+
+  subject do
+    described_class.new(resource).as_json
+  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
+end