diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-09 12:11:57 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-09 12:11:57 +0000 |
commit | 1f229cdc22b5b32989bcff2037d8925c75703671 (patch) | |
tree | c92e9dff7737e78d7331518cdf69f90403af09ea /spec/serializers | |
parent | 7a98d989740ec85982cdb6c1d57c8f24270e455e (diff) | |
download | gitlab-ce-1f229cdc22b5b32989bcff2037d8925c75703671.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers')
-rw-r--r-- | spec/serializers/merge_request_poll_widget_entity_spec.rb | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/spec/serializers/merge_request_poll_widget_entity_spec.rb b/spec/serializers/merge_request_poll_widget_entity_spec.rb index 409585e52f1..90a82d16e38 100644 --- a/spec/serializers/merge_request_poll_widget_entity_spec.rb +++ b/spec/serializers/merge_request_poll_widget_entity_spec.rb @@ -184,38 +184,8 @@ RSpec.describe MergeRequestPollWidgetEntity do end describe '#mergeable_discussions_state?' do - context 'when change_response_code_merge_status is true' do - before do - stub_feature_flags(change_response_code_merge_status: true) - end - - it 'returns mergeable discussions state' do - expect(subject[:mergeable_discussions_state]).to eq(true) - end - end - - context 'when change_response_code_merge_status is false' do - context 'when merge request is in a mergeable state' do - before do - stub_feature_flags(change_response_code_merge_status: false) - allow(resource).to receive(:mergeable_discussions_state?).and_return(true) - end - - it 'returns mergeable discussions state' do - expect(subject[:mergeable_discussions_state]).to eq(true) - end - end - - context 'when merge request is not in a mergeable state' do - before do - stub_feature_flags(change_response_code_merge_status: false) - allow(resource).to receive(:mergeable_state?).and_return(false) - end - - it 'returns mergeable discussions state' do - expect(subject[:mergeable_discussions_state]).to eq(false) - end - end + it 'returns mergeable discussions state' do + expect(subject[:mergeable_discussions_state]).to eq(true) end end end |