Allow skip merging using wip or working in progress

bosondata · Apr 16, 2017 · 1471d51 · 1471d51
1 parent 72c0864
commit 1471d51
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 7 deletions.
diff --git a/badwolf/webhook/views.py b/badwolf/webhook/views.py
@@ -148,11 +148,13 @@ def handle_pull_request_approved(payload):
     repo = payload['repository']
     pr = payload['pullrequest']
     pr_id = pr['id']
-    title = pr['title']
-    description = pr['description'] or ''
-    if 'merge skip' in title.lower() or 'merge skip' in description.lower():
-        logger.info('merge skip found, ignore auto merge.')
-        return
+    title = pr['title'].lower()
+    description = (pr['description'] or '').lower()
+
+    for keyword in ('wip', 'merge skip', 'working in progress'):
+        if keyword in title.lower() or keyword in description.lower():
+            logger.info('%s found, ignore auto merge.', keyword)
+            return
 
     pull_request = PullRequest(
         bitbucket,

diff --git a/tests/test_auto_merge_pull_request.py b/tests/test_auto_merge_pull_request.py
@@ -59,7 +59,7 @@ def test_auto_merge_failure_pr_get_error(app, test_client):
             status_get.assert_not_called()
 
 
-def test_auto_merge_skip_title(test_client):
+def test_auto_merge_skip_merge_skip_in_title(test_client):
     payload = json.dumps({
         'repository': {
             'full_name': 'deepanalyzer/badwolf',
@@ -81,7 +81,7 @@ def test_auto_merge_skip_title(test_client):
         pr_get.assert_not_called()
 
 
-def test_auto_merge_skip_description(test_client):
+def test_auto_merge_skip_merge_skip_in_description(test_client):
     payload = json.dumps({
         'repository': {
             'full_name': 'deepanalyzer/badwolf',
@@ -103,6 +103,50 @@ def test_auto_merge_skip_description(test_client):
         pr_get.assert_not_called()
 
 
+def test_auto_merge_skip_wip_in_title(test_client):
+    payload = json.dumps({
+        'repository': {
+            'full_name': 'deepanalyzer/badwolf',
+        },
+        'pullrequest': {
+            'id': 1,
+            'title': '[wip] PR 1',
+            'description': 'PR 1',
+        },
+    })
+    with mock.patch.object(bitbucket.PullRequest, 'get') as pr_get:
+        test_client.post(
+            url_for('webhook.webhook_push'),
+            data=payload,
+            headers={
+                'X-Event-Key': 'pullrequest:approved',
+            }
+        )
+        pr_get.assert_not_called()
+
+
+def test_auto_merge_skip_wip_in_description(test_client):
+    payload = json.dumps({
+        'repository': {
+            'full_name': 'deepanalyzer/badwolf',
+        },
+        'pullrequest': {
+            'id': 1,
+            'title': 'PR 1',
+            'description': 'This is PR1. WIP',
+        },
+    })
+    with mock.patch.object(bitbucket.PullRequest, 'get') as pr_get:
+        test_client.post(
+            url_for('webhook.webhook_push'),
+            data=payload,
+            headers={
+                'X-Event-Key': 'pullrequest:approved',
+            }
+        )
+        pr_get.assert_not_called()
+
+
 def test_auto_merge_skip_pr_not_in_open_state(test_client):
     payload = json.dumps({
         'repository': {