Merge pull request #112 from davidalber/test-add-labels

Modifying and testing `add_labels`

Author: nrc

highfive/newpr.py

@@ -138,13 +138,7 @@ def is_collaborator(commenter, owner, repo, user, token):
             raise e
 
 def add_labels(labels, owner, repo, issue, user, token):
-    try:
-        result = api_req("POST", issue_labels_url % (owner, repo, issue), labels, user, token)
-    except urllib2.HTTPError, e:
-        if e.code == 201:
-            pass
-        else:
-            raise e
+    api_req("POST", issue_labels_url % (owner, repo, issue), labels, user, token)
 
 
 # This function is adapted from https://github.com/kennethreitz/requests/blob/209a871b638f85e2c61966f82e547377ed4260d9/requests/utils.py#L562

highfive/tests/test_newpr.py

@@ -164,6 +164,35 @@ def test_is_collaborator_error(self, mock_api_req):
             None, 'integrationUser', 'credential'
         )
 
+    @mock.patch('highfive.newpr.api_req')
+    def test_add_labels_success(self, mock_api_req):
+        mock_api_req.return_value = {'body': 'response body!'}
+        labels = ['label1', 'label2']
+        self.assertIsNone(
+            newpr.add_labels(
+                labels, 'repo-owner', 'repo-name', 7, 'integrationUser',
+                'credential'
+            )
+        )
+        mock_api_req.assert_called_with(
+            'POST', 'https://api.github.com/repos/repo-owner/repo-name/issues/7/labels',
+            labels, 'integrationUser', 'credential'
+        )
+
+    @mock.patch('highfive.newpr.api_req')
+    def test_add_labels_error(self, mock_api_req):
+        mock_api_req.return_value = {}
+        mock_api_req.side_effect = HTTPError(None, 422, None, None, None)
+        labels = ['label1', 'label2']
+        self.assertRaises(
+            HTTPError, newpr.add_labels, labels, 'repo-owner', 'repo-name',
+            7, 'integrationUser', 'credential'
+        )
+        mock_api_req.assert_called_with(
+            'POST', 'https://api.github.com/repos/repo-owner/repo-name/issues/7/labels',
+            labels, 'integrationUser', 'credential'
+        )
+
     def test_submodule(self):
         submodule_diff = self._load_fake('submodule.diff')
         self.assertTrue(newpr.modifies_submodule(submodule_diff))