Fixed tests to align with changes in squash parameter

John-Paul Stanford · John-Paul Stanford · commit ef5359738893 · 2018-01-07T10:35:48.000Z
diff --git a/tests/unit/test_pulls.py b/tests/unit/test_pulls.py
@@ -99,16 +99,16 @@ def test_merge(self):
 
         self.put_called_with(
             url_for('merge'),
-            data={"squash": False}
+            data={"merge_method": "merge"}
         )
 
     def test_merge_squash_message(self):
         """Show that a user can merge a Pull Request."""
-        self.instance.merge('commit message', squash=True)
+        self.instance.merge('commit message', merge_method='squash')
 
         self.put_called_with(
             url_for('merge'),
-            data={"squash": True, "commit_message": "commit message"}
+            data={"merge_method": "squash", "commit_message": "commit message"}
         )
 
     def test_patch(self):
