From 0ea3fcec397b69815975647f5e2aa5fe944a8486 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Jun 2022 11:10:13 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-1-stable-ee --- .../merge_request_poll_widget_entity_spec.rb | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'spec/serializers/merge_request_poll_widget_entity_spec.rb') diff --git a/spec/serializers/merge_request_poll_widget_entity_spec.rb b/spec/serializers/merge_request_poll_widget_entity_spec.rb index 581efd331ef..409585e52f1 100644 --- a/spec/serializers/merge_request_poll_widget_entity_spec.rb +++ b/spec/serializers/merge_request_poll_widget_entity_spec.rb @@ -182,4 +182,40 @@ RSpec.describe MergeRequestPollWidgetEntity do end end 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 + end + end end -- cgit v1.2.3