test/models/deploy_spec_test.rb in shipit-engine-0.22.0 vs test/models/deploy_spec_test.rb in shipit-engine-0.23.0

@@ -293,10 +293,11 @@
       config = {
         'merge' => {
           'require' => [],
           'ignore' => [],
           'revalidate_after' => nil,
+          'method' => nil,
           'max_divergence' => {
             'commits' => nil,
             'age' => nil,
           },
         },
@@ -438,9 +439,32 @@
           'require' => %w(ci/circleci),
           'blocking' => %w(soc/compliance),
         },
       )
       assert_equal %w(ci/circleci soc/compliance), @spec.required_statuses
+    end
+
+    test "pull_request_merge_method defaults to `nil`" do
+      @spec.expects(:load_config).returns({})
+      assert_nil @spec.pull_request_merge_method
+    end
+
+    test "pull_request_merge_method returns `merge.method`" do
+      @spec.expects(:load_config).returns(
+        'merge' => {
+          'method' => 'squash',
+        },
+      )
+      assert_equal 'squash', @spec.pull_request_merge_method
+    end
+
+    test "pull_request_merge_method returns `nil` if `merge.method` is invalid" do
+      @spec.expects(:load_config).returns(
+        'merge' => {
+          'method' => 'squashing',
+        },
+      )
+      assert_nil @spec.pull_request_merge_method
     end
 
     test "pull_request_ignored_statuses defaults to the union of ci.hide and ci.allow_failures" do
       @spec.expects(:load_config).returns(
         'ci' => {