diff options
Diffstat (limited to '')
| -rw-r--r-- | pygithub3/services/repos/__init__.py | 2 | ||||
| -rw-r--r-- | pygithub3/services/repos/forks.py | 2 | ||||
| -rw-r--r-- | pygithub3/services/repos/watchers.py | 2 | ||||
| -rw-r--r-- | pygithub3/services/users/__init__.py | 2 | ||||
| -rw-r--r-- | pygithub3/services/users/followers.py | 12 | ||||
| -rw-r--r-- | pygithub3/tests/services/test_repos.py | 17 | ||||
| -rw-r--r-- | pygithub3/tests/services/test_users.py | 27 |
7 files changed, 19 insertions, 45 deletions
diff --git a/pygithub3/services/repos/__init__.py b/pygithub3/services/repos/__init__.py index df029e8..3ef1fb4 100644 --- a/pygithub3/services/repos/__init__.py +++ b/pygithub3/services/repos/__init__.py @@ -42,7 +42,7 @@ class Repos(Service): repo_service.list('copitux', type='owner') repo_service.list(type='private') """ - request = self.make_request('repos.list', user=user) + request = self.request_builder('repos.list', user=user) return self._get_result(request, type=type) def list_by_org(self, org, type='all'): diff --git a/pygithub3/services/repos/forks.py b/pygithub3/services/repos/forks.py index df51347..63ba2b8 100644 --- a/pygithub3/services/repos/forks.py +++ b/pygithub3/services/repos/forks.py @@ -45,7 +45,7 @@ class Forks(Service): forks_service.create(user='octocat', repo='oct_repo') forks_service.create(user='octocat', repo='oct_repo', - org='myorganization' + org='myorganization') """ request = self.make_request('repos.forks.create', user=user, repo=repo) org = org and {'org': org} or {} diff --git a/pygithub3/services/repos/watchers.py b/pygithub3/services/repos/watchers.py index 7bcede5..cdc3624 100644 --- a/pygithub3/services/repos/watchers.py +++ b/pygithub3/services/repos/watchers.py @@ -39,7 +39,7 @@ class Watchers(Service): watchers_service.list_repos('copitux') watchers_service.list_repos() """ - request = self.make_request('repos.watchers.list_repos', user=user) + request = self.request_builder('repos.watchers.list_repos', user=user) return self._get_result(request) def is_watching(self, user=None, repo=None): diff --git a/pygithub3/services/users/__init__.py b/pygithub3/services/users/__init__.py index fa93ca2..fe87d2a 100644 --- a/pygithub3/services/users/__init__.py +++ b/pygithub3/services/users/__init__.py @@ -32,7 +32,7 @@ class User(Service): user_service.get('copitux') user_service.get() """ - request = self.make_request('users.get', user=user) + request = self.request_builder('users.get', user=user) return self._get(request) def update(self, data): diff --git a/pygithub3/services/users/followers.py b/pygithub3/services/users/followers.py index 5a8176d..673d721 100644 --- a/pygithub3/services/users/followers.py +++ b/pygithub3/services/users/followers.py @@ -26,7 +26,7 @@ class Followers(Service): followers_service.list() followers_service.list('octocat') """ - request = self.make_request('users.followers.list', user=user) + request = self.request_builder('users.followers.list', user=user) return self._get_result(request) def list_following(self, user=None): @@ -46,7 +46,8 @@ class Followers(Service): followers_service.list_following() followers_service.list_following('octocat') """ - request = self.make_request('users.followers.listfollowing', user=user) + request = self.request_builder('users.followers.listfollowing', + user=user) return self._get_result(request) def is_following(self, user): @@ -54,7 +55,8 @@ class Followers(Service): :param str user: Username """ - request = self.make_request('users.followers.isfollowing', user=user) + request = self.request_builder('users.followers.isfollowing', + user=user) return self._bool(request) def follow(self, user): @@ -65,7 +67,7 @@ class Followers(Service): .. warning:: You must be authenticated """ - request = self.make_request('users.followers.follow', user=user) + request = self.request_builder('users.followers.follow', user=user) self._put(request) def unfollow(self, user): @@ -76,5 +78,5 @@ class Followers(Service): .. warning:: You must be authenticated """ - request = self.make_request('users.followers.unfollow', user=user) + request = self.request_builder('users.followers.unfollow', user=user) self._delete(request) diff --git a/pygithub3/tests/services/test_repos.py b/pygithub3/tests/services/test_repos.py index fd15fe9..e77cc90 100644 --- a/pygithub3/tests/services/test_repos.py +++ b/pygithub3/tests/services/test_repos.py @@ -30,18 +30,12 @@ class TestRepoService(TestCase): self.rs.list().all() self.assertEqual(request_method.call_args[0], ('get', _('user/repos'))) - def test_LIST_with_user_in_args(self, request_method): + def test_LIST_with_user(self, request_method): request_method.return_value = mock_response_result() self.rs.list('octoc').all() self.assertEqual(request_method.call_args[0], ('get', _('users/octoc/repos'))) - def test_LIST_with_user_in_service(self, request_method): - request_method.return_value = mock_response_result() - self.rs.list().all() - self.assertEqual(request_method.call_args[0], - ('get', _('users/octocat/repos'))) - def test_LIST_filters(self, request_method): request_method.return_value = mock_response_result() self.rs.list('octoc', type='public').all() @@ -340,14 +334,13 @@ class TestWatchersService(TestCase): request_method.return_value = mock_response_result() self.ws.list_repos().all() self.assertEqual(request_method.call_args[0], - ('get', _('users/oct/watched'))) + ('get', _('user/watched'))) - def test_LIST_repos_without_user(self, request_method): + def test_LIST_repos_with_user(self, request_method): request_method.return_value = mock_response_result() - self.ws.set_user(None) - self.ws.list_repos().all() + self.ws.list_repos('oct').all() self.assertEqual(request_method.call_args[0], - ('get', _('user/watched'))) + ('get', _('users/oct/watched'))) def test_IS_watching(self, request_method): request_method.return_value = mock_response() diff --git a/pygithub3/tests/services/test_users.py b/pygithub3/tests/services/test_users.py index f777d6d..317f0d5 100644 --- a/pygithub3/tests/services/test_users.py +++ b/pygithub3/tests/services/test_users.py @@ -28,19 +28,12 @@ class TestUserService(TestCase): self.us.get() self.assertEqual(request_method.call_args[0], ('get', _('user'))) - def test_GET_with_user_in_arg(self, request_method): + def test_GET_with_user(self, request_method): request_method.return_value = mock_response() self.us.get('octocat') self.assertEqual(request_method.call_args[0], ('get', _('users/octocat'))) - def test_GET_with_user_in_service(self, request_method): - request_method.return_value = mock_response() - self.us.set_user('octocat_service') - self.us.get() - self.assertEqual(request_method.call_args[0], - ('get', _('users/octocat_service'))) - def test_UPDATE_with_valid_data(self, request_method): request_method.return_value = mock_response('patch') self.us.update({'name': 'dummy'}) @@ -101,38 +94,24 @@ class TestFollowersService(TestCase): self.assertEqual(request_method.call_args[0], ('get', _('user/followers'))) - def test_LIST_with_user_in_arg(self, request_method): + def test_LIST_with_user(self, request_method): request_method.return_value = mock_response_result() self.fs.list('octocat').all() self.assertEqual(request_method.call_args[0], ('get', _('users/octocat/followers'))) - def test_LIST_with_user_in_service(self, request_method): - request_method.return_value = mock_response_result() - self.fs.set_user('octocat_service') - self.fs.list().all() - self.assertEqual(request_method.call_args[0], - ('get', _('users/octocat_service/followers'))) - def test_LIST_FOLLOWING_without_user(self, request_method): request_method.return_value = mock_response_result() self.fs.list_following().all() self.assertEqual(request_method.call_args[0], ('get', _('user/following'))) - def test_LIST_FOLLOWING_with_user_in_arg(self, request_method): + def test_LIST_FOLLOWING_with_user(self, request_method): request_method.return_value = mock_response_result() self.fs.list_following('octocat').all() self.assertEqual(request_method.call_args[0], ('get', _('users/octocat/following'))) - def test_LIST_FOLLOWING_with_user_in_service(self, request_method): - request_method.return_value = mock_response_result() - self.fs.set_user('octocat_service') - self.fs.list_following().all() - self.assertEqual(request_method.call_args[0], - ('get', _('users/octocat_service/following'))) - def test_IS_FOLLOWING(self, request_method): self.fs.is_following('octocat') self.assertEqual(request_method.call_args[0], |