diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 15:10:18 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 15:10:18 +0300 |
commit | 111e0ef1fa06e79adf73a34ebd14f71bfeb99bff (patch) | |
tree | f3280afa857d3357006ada7e9a4483c8c6994584 /spec/serializers/merge_request_poll_widget_entity_spec.rb | |
parent | 22e9f240efba67d752e33ebdb8ba8205f187dc83 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers/merge_request_poll_widget_entity_spec.rb')
-rw-r--r-- | spec/serializers/merge_request_poll_widget_entity_spec.rb | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/spec/serializers/merge_request_poll_widget_entity_spec.rb b/spec/serializers/merge_request_poll_widget_entity_spec.rb index c88555226a9..9a0e25516cb 100644 --- a/spec/serializers/merge_request_poll_widget_entity_spec.rb +++ b/spec/serializers/merge_request_poll_widget_entity_spec.rb @@ -229,21 +229,13 @@ RSpec.describe MergeRequestPollWidgetEntity do expect(subject[:mergeable]).to eq(true) end - context 'when async_mergeability_check is passed' do - let(:options) { { async_mergeability_check: true } } - - it 'returns false' do - expect(subject[:mergeable]).to eq(false) + context 'when check_mergeability_async_in_widget is disabled' do + before do + stub_feature_flags(check_mergeability_async_in_widget: false) end - context 'when check_mergeability_async_in_widget is disabled' do - before do - stub_feature_flags(check_mergeability_async_in_widget: false) - end - - it 'calculates mergeability and returns true' do - expect(subject[:mergeable]).to eq(true) - end + it 'calculates mergeability and returns true' do + expect(subject[:mergeable]).to eq(true) end end end |