Added tests for requests for merge (github only)

guyzmo · guyzmo · commit 90941c05f3c7 · 2016-05-23T01:14:21.000+02:00
diff --git a/tests/helpers.py b/tests/helpers.py
@@ -25,6 +25,8 @@ def __init__(self, *args, **kwarg):
         self._did_create = None
         self._did_fork = None
         self._did_user = False
+        self._did_request_list = None
+        self._did_request_fetch = None
 
     def pull(self, *args, **kwarg):
         self._did_pull = (args, kwarg)
@@ -50,6 +52,18 @@ def create(self, *args, **kwarg):
     def fork(self, *args, **kwarg):
         self._did_fork = (args, kwarg)
 
+    def request_list(self, *args, **kwarg):
+        self._did_request_list = (args, kwarg)
+        return [('1', 'desc1', 'http://request/1'),
+                ('2', 'desc2', 'http://request/2'),
+                ('3', 'desc3', 'http://request/3')]
+
+    def request_fetch(self, *args, **kwarg):
+        self._did_request_fetch = (args, kwarg)
+        if args[-1] == 'bad':
+            raise Exception('bad request for merge!')
+        return "pr/42"
+
     @property
     def user(self):
         self._did_user = True
@@ -100,6 +114,7 @@ def setup_args(self, d, args={}):
             'fetch': False,
             'fork': False,
             'list': False,
+            'ls': False,
             'open': False,
             'request': False,
             '<request>': None,
@@ -157,10 +172,25 @@ def main_fork(self, repo, rc=0, args={}):
         return RepositoryService._current._did_fork
 
     def main_request_list(self, repo, rc=0, args={}):
-        assert True
+        assert rc == main(self.setup_args({
+            'request': True,
+            'list': True,
+            '<user>/<repo>': repo,
+            '--clone': True,
+            '--path': self.tempdir.name
+        }, args)), "Non {} result for request list".format(rc)
+        return RepositoryService._current._did_request_list
 
     def main_request_fetch(self, repo, rc=0, args={}):
-        assert True
+        assert rc == main(self.setup_args({
+            'request': True,
+            'fetch': True,
+            '<user>/<repo>': repo,
+            '--clone': True,
+            '--path': self.tempdir.name
+        }, args)), "Non {} result for request fetch".format(rc)
+        return RepositoryService._current._did_request_fetch
+
     def main_open(self, repo, rc=0, args={}):
         os.mkdir(os.path.join(self.tempdir.name, repo.split('/')[-1]))
         Repo.init(os.path.join(self.tempdir.name, repo.split('/')[-1]))
@@ -410,6 +440,20 @@ def action_add(self, cassette_name, namespace, repository, alone=False, name=Non
                     self.assert_added_remote(name)
                     self.assert_tracking_remote(name, tracking)
 
+    def action_request_list(self, cassette_name, namespace, repository, rq_list_data=[]):
+        with self.recorder.use_cassette('_'.join(['test', self.service.name, cassette_name])):
+            self.service.connect()
+            requests = list(self.service.request_list(user=namespace, repo=repository))
+            for i, rq in enumerate(rq_list_data):
+                assert requests[i] == rq
+
+    def action_request_fetch(self, cassette_name, namespace, repository, request, pull=False):
+        with self.recorder.use_cassette('_'.join(['test', self.service.name, cassette_name])):
+            self.service.connect()
+            self.service.clone(namespace, repository)
+            self.service.request_fetch(repository, namespace, request)
+            assert self.repository.branches[-1].name == 'request-{}'.format(request)
+
     def action_open(self, cassette_name, namespace, repository):
         self.set_mock_popen_commands([
             ('xdg-open {}'.format(self.service.format_path(namespace=namespace, repository=repository)), b'', b'', 0),
diff --git a/tests/integration/cassettes/test_github_test_14_request_list.json b/tests/integration/cassettes/test_github_test_14_request_list.json
diff --git a/tests/integration/cassettes/test_github_test_15_request_fetch.json b/tests/integration/cassettes/test_github_test_15_request_fetch.json
@@ -0,0 +1,62 @@
+{
+  "http_interactions": [
+    {
+      "recorded_at": "2016-05-22T21:20:21",
+      "request": {
+        "body": {
+          "encoding": "utf-8",
+          "string": ""
+        },
+        "headers": {
+          "Accept": "application/vnd.github.v3.full+json",
+          "Accept-Charset": "utf-8",
+          "Accept-Encoding": "identity",
+          "Authorization": "token <PRIVATE_KEY_GITHUB>",
+          "Connection": "keep-alive",
+          "Content-Type": "application/json",
+          "User-Agent": "github3.py/0.9.5"
+        },
+        "method": "GET",
+        "uri": "https://api.github.com/user"
+      },
+      "response": {
+        "body": {
+          "encoding": "utf-8",
+          "string": "{\"login\":\"<GITHUB_NAMESPACE>\",\"id\":254441,\"avatar_url\":\"https://avatars.githubusercontent.com/u/254441?v=3\",\"gravatar_id\":\"\",\"url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>\",\"html_url\":\"https://github.com/<GITHUB_NAMESPACE>\",\"followers_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/followers\",\"following_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/following{/other_user}\",\"gists_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/gists{/gist_id}\",\"starred_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/starred{/owner}{/repo}\",\"subscriptions_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/subscriptions\",\"organizations_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/orgs\",\"repos_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/repos\",\"events_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/events{/privacy}\",\"received_events_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/received_events\",\"type\":\"User\",\"site_admin\":false,\"name\":\"<GITHUB_NAMESPACE>\",\"company\":null,\"blog\":\"http://<GITHUB_NAMESPACE>.got.nothing.to/blog/\",\"location\":\"Paris\",\"email\":null,\"hireable\":true,\"bio\":null,\"public_repos\":73,\"public_gists\":14,\"followers\":44,\"following\":13,\"created_at\":\"2010-04-27T14:04:09Z\",\"updated_at\":\"2016-03-26T00:48:05Z\"}"
+        },
+        "headers": {
+          "Access-Control-Allow-Origin": "*",
+          "Access-Control-Expose-Headers": "ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval",
+          "Cache-Control": "private, max-age=60, s-maxage=60",
+          "Content-Length": "1118",
+          "Content-Security-Policy": "default-src 'none'",
+          "Content-Type": "application/json; charset=utf-8",
+          "Date": "Sun, 22 May 2016 21:20:22 GMT",
+          "ETag": "\"a03b1823bdc81ce18c8fad535632335e\"",
+          "Last-Modified": "Sat, 26 Mar 2016 00:48:05 GMT",
+          "Server": "GitHub.com",
+          "Status": "200 OK",
+          "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+          "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+          "X-Accepted-OAuth-Scopes": "",
+          "X-Content-Type-Options": "nosniff",
+          "X-Frame-Options": "deny",
+          "X-GitHub-Media-Type": "github.v3; param=full; format=json",
+          "X-GitHub-Request-Id": "4EC11365:1271B:DE6536F:57422296",
+          "X-OAuth-Scopes": "delete_repo, gist, repo",
+          "X-RateLimit-Limit": "5000",
+          "X-RateLimit-Remaining": "4970",
+          "X-RateLimit-Reset": "1463952313",
+          "X-Served-By": "52437fedc85beec8da3449496900fb9a",
+          "X-XSS-Protection": "1; mode=block"
+        },
+        "status": {
+          "code": 200,
+          "message": "OK"
+        },
+        "url": "https://api.github.com/user"
+      }
+    }
+  ],
+  "recorded_with": "betamax/0.5.1"
+}
diff --git a/tests/integration/cassettes/test_github_test_16_request_fetch__bad_request.json b/tests/integration/cassettes/test_github_test_16_request_fetch__bad_request.json
@@ -0,0 +1,62 @@
+{
+  "http_interactions": [
+    {
+      "recorded_at": "2016-05-22T21:21:06",
+      "request": {
+        "body": {
+          "encoding": "utf-8",
+          "string": ""
+        },
+        "headers": {
+          "Accept": "application/vnd.github.v3.full+json",
+          "Accept-Charset": "utf-8",
+          "Accept-Encoding": "identity",
+          "Authorization": "token <PRIVATE_KEY_GITHUB>",
+          "Connection": "keep-alive",
+          "Content-Type": "application/json",
+          "User-Agent": "github3.py/0.9.5"
+        },
+        "method": "GET",
+        "uri": "https://api.github.com/user"
+      },
+      "response": {
+        "body": {
+          "encoding": "utf-8",
+          "string": "{\"login\":\"<GITHUB_NAMESPACE>\",\"id\":254441,\"avatar_url\":\"https://avatars.githubusercontent.com/u/254441?v=3\",\"gravatar_id\":\"\",\"url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>\",\"html_url\":\"https://github.com/<GITHUB_NAMESPACE>\",\"followers_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/followers\",\"following_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/following{/other_user}\",\"gists_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/gists{/gist_id}\",\"starred_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/starred{/owner}{/repo}\",\"subscriptions_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/subscriptions\",\"organizations_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/orgs\",\"repos_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/repos\",\"events_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/events{/privacy}\",\"received_events_url\":\"https://api.github.com/users/<GITHUB_NAMESPACE>/received_events\",\"type\":\"User\",\"site_admin\":false,\"name\":\"<GITHUB_NAMESPACE>\",\"company\":null,\"blog\":\"http://<GITHUB_NAMESPACE>.got.nothing.to/blog/\",\"location\":\"Paris\",\"email\":null,\"hireable\":true,\"bio\":null,\"public_repos\":73,\"public_gists\":14,\"followers\":44,\"following\":13,\"created_at\":\"2010-04-27T14:04:09Z\",\"updated_at\":\"2016-03-26T00:48:05Z\"}"
+        },
+        "headers": {
+          "Access-Control-Allow-Origin": "*",
+          "Access-Control-Expose-Headers": "ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval",
+          "Cache-Control": "private, max-age=60, s-maxage=60",
+          "Content-Length": "1118",
+          "Content-Security-Policy": "default-src 'none'",
+          "Content-Type": "application/json; charset=utf-8",
+          "Date": "Sun, 22 May 2016 21:21:07 GMT",
+          "ETag": "\"a03b1823bdc81ce18c8fad535632335e\"",
+          "Last-Modified": "Sat, 26 Mar 2016 00:48:05 GMT",
+          "Server": "GitHub.com",
+          "Status": "200 OK",
+          "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+          "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+          "X-Accepted-OAuth-Scopes": "",
+          "X-Content-Type-Options": "nosniff",
+          "X-Frame-Options": "deny",
+          "X-GitHub-Media-Type": "github.v3; param=full; format=json",
+          "X-GitHub-Request-Id": "4EC11365:12719:CB2E110:574222C3",
+          "X-OAuth-Scopes": "delete_repo, gist, repo",
+          "X-RateLimit-Limit": "5000",
+          "X-RateLimit-Remaining": "4969",
+          "X-RateLimit-Reset": "1463952313",
+          "X-Served-By": "5aeb3f30c9e3ef6ef7bcbcddfd9a68f7",
+          "X-XSS-Protection": "1; mode=block"
+        },
+        "status": {
+          "code": 200,
+          "message": "OK"
+        },
+        "url": "https://api.github.com/user"
+      }
+    }
+  ],
+  "recorded_with": "betamax/0.5.1"
+}
diff --git a/tests/integration/test_github.py b/tests/integration/test_github.py
@@ -16,7 +16,7 @@
 from tests.helpers import GitRepoTestCase
 
 from git_repo.services.service import github
-from git_repo.exceptions import ResourceExistsError
+from git_repo.exceptions import ResourceExistsError, ResourceNotFoundError
 
 
 class Test_Github(GitRepoTestCase):
@@ -118,7 +118,12 @@ def test_12_add__alone_default_name(self):
                         name='test0r',
                         tracking='github')
 
-    def test_13_request_list(self):
+    def test_13_open(self):
+        self.action_open(cassette_name=sys._getframe().f_code.co_name,
+                         namespace='guyzmo',
+                         repository='git-repo')
+
+    def test_14_request_list(self):
         self.action_request_list(
                 cassette_name=sys._getframe().f_code.co_name,
                 namespace='guyzmo',
@@ -128,22 +133,17 @@ def test_13_request_list(self):
             (2, 'prefer gitrepo.<target>.token > privatekey, docs', 'https://api.github.com/repos/guyzmo/git-repo/issues/2'),
         ])
 
-    def test_14_request_fetch(self):
+    def test_15_request_fetch(self):
         self.action_request_fetch(cassette_name=sys._getframe().f_code.co_name,
                 namespace='guyzmo',
                 repository='git-repo',
                 request='2')
 
-    def test_15_request_fetch__bad_request(self):
+    def test_16_request_fetch__bad_request(self):
         with pytest.raises(ResourceNotFoundError):
             self.action_request_fetch(cassette_name=sys._getframe().f_code.co_name,
                 namespace='guyzmo',
                 repository='git-repo',
                 request='1')
 
-    def test_31_open(self):
-        self.action_open(cassette_name=sys._getframe().f_code.co_name,
-                         namespace='guyzmo',
-                         repository='git-repo')
-
 
diff --git a/tests/integration/test_main.py b/tests/integration/test_main.py
@@ -154,17 +154,38 @@ def test_fork__branch_clone(self):
         assert ('guyzmo', 'git-repo') == repo_slug
         assert {'branch': 'foobar', 'clone': True} == seen_args
 
-    def test_request_list(self):
-        repo_slug, seen_args = self.main_request_list('guyzmo/git-repo', 0,
-                                                      args={})
+    def test_request_list(self, capsys, caplog):
+        from subprocess import call
+        call(['git', 'init', '-q', self.tempdir.name])
+        repo_slug, seen_args = self.main_request_list('guyzmo/git-repo', 0, args={})
+        out, err = capsys.readouterr()
+        assert out ==  '  1\tdesc1                                                       \thttp://request/1\n  2\tdesc2                                                       \thttp://request/2\n  3\tdesc3                                                       \thttp://request/3\n'
+        assert 'id' in caplog.text and 'title' in caplog.text and 'URL' in caplog.text
+
+    def test_request_fetch__request(self, capsys, caplog):
+        from subprocess import call
+        call(['git', 'init', '-q', self.tempdir.name])
+        seen_args, extra_args = self.main_request_fetch('guyzmo/git-repo', 0,
+                args={'<request>': '42'})
+        out, err = capsys.readouterr()
+        assert ('guyzmo', 'git-repo', '42') == seen_args
+        assert {} == extra_args
+        assert out == ''
+        assert 'Successfully fetched request id `42` of `guyzmo/git-repo` into `pr/42`!' in caplog.text
+
+    def test_request_fetch__bad_request(self, capsys, caplog):
+        from subprocess import call
+        call(['git', 'init', '-q', self.tempdir.name])
+        seen_args, extra_args = self.main_request_fetch('guyzmo/git-repo', 2,
+                args={'<request>': 'bad', '--verbose': 0})
+        out, err = capsys.readouterr()
+        assert ('guyzmo', 'git-repo', 'bad') == seen_args
+        assert {} == extra_args
+        print('out:', out)
+        print('err:', caplog.text)
+        assert out == ''
+        assert 'Fatal error: bad request for merge!' in caplog.text
 
-    def test_request_fetch__request(self):
-        repo_slug, seen_args = self.main_request_fetch('guyzmo/git-repo', 0,
-                                                       args={})
-
-    def test_request_fetch__bad_request(self):
-        repo_slug, seen_args = self.main_request_fetch('guyzmo/git-repo', 0,
-                                                       args={})
     def test_open(self):
         repo_slug, seen_args = self.main_open('guyzmo/git-repo', 0)
         assert ('guyzmo', 'git-repo') == repo_slug
