Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/serializers/merge_request_poll_cached_widget_entity_spec.rb')
-rw-r--r--spec/serializers/merge_request_poll_cached_widget_entity_spec.rb20
1 files changed, 14 insertions, 6 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 ecc93219b53..e9c1fe23855 100644
--- a/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb
+++ b/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb
@@ -21,12 +21,6 @@ RSpec.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
-
it 'has blob path data' do
allow(resource).to receive_messages(
base_pipeline: pipeline,
@@ -38,6 +32,20 @@ RSpec.describe MergeRequestPollCachedWidgetEntity do
expect(subject[:blob_path]).to include(:head_path)
end
+ describe 'merge_status' do
+ it 'calls for MergeRequest#check_mergeability' do
+ expect(resource).to receive(:check_mergeability).with(async: true)
+
+ subject[:merge_status]
+ 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
+
describe 'diverged_commits_count' do
context 'when MR open and its diverging' do
it 'returns diverged commits count' do