Merge pull request sigmavirus24#673 from dprothero/fix-issue-672

sigmavirus24 · web-flow · commit b0b27c4a8593 · 2017-01-27T18:17:30.000-06:00
Ensure query string is included when building _api URL. Fixes sigmavirus24#672
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -145,3 +145,4 @@ Contributors
 
 - Björn Kautler (@Vampire)
 
+- David Prothero (@dprothero)
diff --git a/github3/models.py b/github3/models.py
@@ -276,7 +276,10 @@ def _build_url(self, *args, **kwargs):
 
     @property
     def _api(self):
-        return "{0.scheme}://{0.netloc}{0.path}".format(self._uri)
+        value = "{0.scheme}://{0.netloc}{0.path}".format(self._uri)
+        if self._uri.query:
+            value += '?{}'.format(self._uri.query)
+        return value
 
     @_api.setter
     def _api(self, uri):
diff --git a/tests/cassettes/Contents_delete.json b/tests/cassettes/Contents_delete.json
diff --git a/tests/cassettes/Contents_update.json b/tests/cassettes/Contents_update.json
diff --git a/tests/integration/test_repos_repo.py b/tests/integration/test_repos_repo.py
@@ -1135,8 +1135,9 @@ def test_delete(self):
         cassette_name = self.cassette_name('delete')
         with self.recorder.use_cassette(cassette_name):
             repository = self.gh.repository('github3py', 'delete_contents')
-            content = repository.readme()
-            deleted = content.delete('Deleting readme from repository')
+            repository.create_file('test.txt', 'Create test.txt', b'testing')
+            content = repository.file_contents('test.txt')
+            deleted = content.delete('Deleting test.txt from repository')
 
         assert deleted
 
@@ -1146,13 +1147,17 @@ def test_update(self):
         cassette_name = self.cassette_name('update')
         with self.recorder.use_cassette(cassette_name):
             repository = self.gh.repository('github3py', 'delete_contents')
-            content = repository.readme()
-            update = content.update(message='Updating README.md',
+            repository.create_file('test.txt', 'Create test.txt', b'testing')
+            content = repository.file_contents('test.txt')
+            update = content.update(message='Updating test.txt',
                                     content=b'HELLO')
+            assert isinstance(update, dict)
+            assert isinstance(update['content'],
+                              github3.repos.contents.Contents)
+            assert isinstance(update['commit'], github3.git.Commit)
 
-        assert isinstance(update, dict)
-        assert isinstance(update['content'], github3.repos.contents.Contents)
-        assert isinstance(update['commit'], github3.git.Commit)
+            # Clean-up
+            update['content'].delete('Deleting test.txt from repository')
 
 
 class TestHook(helper.IntegrationHelper):
diff --git a/tests/unit/test_models.py b/tests/unit/test_models.py
@@ -216,3 +216,24 @@ def test_strptime(self):
     def test_strptime_time_str_required(self):
         """Verify that method converts ISO 8601 formatted string."""
         assert self.instance._strptime('') is None
+
+
+class TestGitHubCoreIssue672(helper.UnitHelper):
+
+    described_class = MyTestRefreshClass
+    last_modified = datetime.now().strftime(
+        '%a, %d %b %Y %H:%M:%S GMT'
+    )
+    url = 'https://api.github.com/foo?bar=1'
+    etag = '644b5b0155e6404a9cc4bd9d8b1ae730'
+    example_data = {
+        'url': url,
+        'last_modified': last_modified,
+        'etag': etag,
+        'fake_attr': 'foo',
+    }
+
+    def test_issue_672(self):
+        """Verify that _api property contains URL query"""
+        assert '?' in self.instance._api
+        assert self.instance._api == self.url
diff --git a/tests/unit/test_repos_repo.py b/tests/unit/test_repos_repo.py
@@ -24,6 +24,7 @@
 )
 contents_url_for = helper.create_url_helper(
     'https://api.github.com/repos/github3py/github3.py/contents/README.rst'
+    '?ref=master'
 )
 hook_url_for = helper.create_url_helper(
     'https://api.github.com/repos/octocat/Hello-World/hooks/1'
diff --git a/tox.ini b/tox.ini
@@ -3,6 +3,7 @@ envlist = py{27,33,34,35,py},py{27,34}-flake8,docstrings
 minversion = 2.5.0
 
 [testenv]
+passenv = GH_*
 pip_pre = False
 deps =
     requests{env:REQUESTS_VERSION:>=2.0}

Original file line number	Diff line number	Diff line change
`@@ -145,3 +145,4 @@ Contributors`
`145`	`145`
`146`	`146`	`- Björn Kautler (@Vampire)`
`147`	`147`
	`148`	`+- David Prothero (@dprothero)`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`)`
`25`	`25`	`contents_url_for = helper.create_url_helper(`
`26`	`26`	`'https://api.github.com/repos/github3py/github3.py/contents/README.rst'`
	`27`	`+ '?ref=master'`
`27`	`28`	`)`
`28`	`29`	`hook_url_for = helper.create_url_helper(`
`29`	`30`	`'https://api.github.com/repos/octocat/Hello-World/hooks/1'`