Ensure query string is included when building _api URL. Fixes sigmavirus24#672

dprothero · dprothero · commit 71508d1bf880 · 2017-01-27T14:20:19.000-08:00
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/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
