Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 23 insertions, 1 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 9f96e5711a4..51564de6041 100644
--- a/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb
+++ b/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb
@@ -2,8 +2,9 @@
 
 require 'spec_helper'
 
-describe MergeRequestPollCachedWidgetEntity do
+RSpec.describe MergeRequestPollCachedWidgetEntity do
   include ProjectForksHelper
+  using RSpec::Parameterized::TableSyntax
 
   let(:project)  { create :project, :repository }
   let(:resource) { create(:merge_request, source_project: project, target_project: project) }
@@ -181,6 +182,27 @@ describe MergeRequestPollCachedWidgetEntity do
     end
   end
 
+  describe 'squash defaults for projects' do
+    where(:squash_option, :value, :default, :readonly) do
+      'always'      | true  | true  | true
+      'never'       | false | false | true
+      'default_on'  | false | true  | false
+      'default_off' | false | false | false
+    end
+
+    with_them do
+      before do
+        project.project_setting.update!(squash_option: squash_option)
+      end
+
+      it 'the key reflects the correct value' do
+        expect(subject[:squash_on_merge]).to eq(value)
+        expect(subject[:squash_enabled_by_default]).to eq(default)
+        expect(subject[:squash_readonly]).to eq(readonly)
+      end
+    end
+  end
+
   describe 'attributes for squash commit message' do
     context 'when merge request is mergeable' do
       before do