Use a RepositorySearchResult

sigmavirus24 · sigmavirus24 · commit 7410abf99960 · 2013-12-23T22:33:24.000-06:00
Fix up the tests
diff --git a/github3/github.py b/github3/github.py
@@ -17,7 +17,7 @@
 from github3.models import GitHubCore
 from github3.orgs import Organization
 from github3.repos import Repository
-from github3.search import CodeSearchResult
+from github3.search import CodeSearchResult, RepositorySearchResult
 from github3.structs import SearchIterator
 from github3.users import User, Key
 from github3.notifications import Thread
@@ -1099,8 +1099,8 @@ def search_repositories(self, query, sort=None, order=None,
                 }
 
         url = self._build_url('search', 'repositories')
-        return SearchIterator(number, url, Repository, self, params, etag,
-                              headers)
+        return SearchIterator(number, url, RepositorySearchResult, self,
+                              params, etag, headers)
 
     def set_client_id(self, id, secret):
         """Allows the developer to set their client_id and client_secret for
diff --git a/github3/search/__init__.py b/github3/search/__init__.py
@@ -1,4 +1,5 @@
 from .code import CodeSearchResult
+from .repository import RepositorySearchResult
 
 
-__all__ = [CodeSearchResult]
+__all__ = [CodeSearchResult, RepositorySearchResult]
diff --git a/github3/search/repository.py b/github3/search/repository.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+from github3.models import GitHubCore
+from github3.repos import Repository
+
+
+class RepositorySearchResult(GitHubCore):
+    def __init__(self, data, session=None):
+        result = data.copy()
+        #: Score of the result
+        self.score = result.pop('score')
+        #: Text matches
+        self.text_matches = result.pop('text_matches', [])
+        #: Repository object
+        self.repository = Repository(result, self)
diff --git a/tests/cassettes/GitHub_search_repositories_text_match.json b/tests/cassettes/GitHub_search_repositories_text_match.json
diff --git a/tests/integration/test_api.py b/tests/integration/test_api.py
@@ -10,4 +10,5 @@ def test_search_repositories(self):
                                            cls='GitHub')
         with self.recorder.use_cassette(cassette_name):
             repos = self.gh.search_repositories('github3 language:python')
-            assert isinstance(next(repos), github3.repos.repo.Repository)
+            assert isinstance(next(repos),
+                              github3.search.RepositorySearchResult)
diff --git a/tests/integration/test_github.py b/tests/integration/test_github.py
@@ -17,6 +17,8 @@
 
 
 class TestGitHub(IntegrationHelper):
+    match_on = ['method', 'uri', 'headers']
+
     def test_create_gist(self):
         """Test the ability of a GitHub instance to create a new gist"""
         self.token_login()
@@ -209,7 +211,8 @@ def test_search_code(self):
     def test_search_code_with_text_match(self):
         """Test the ability to use the code search endpoint"""
         cassette_name = self.cassette_name('search_code_with_text_match')
-        with self.recorder.use_cassette(cassette_name):
+        with self.recorder.use_cassette(cassette_name,
+                                        match_requests_on=self.match_on):
             result_iterator = self.gh.search_code(
                 ('HTTPAdapter in:file language:python'
                  ' repo:kennethreitz/requests'),
@@ -225,20 +228,25 @@ def test_search_repositories(self):
         cassette_name = self.cassette_name('search_repositories')
         with self.recorder.use_cassette(cassette_name):
             repos = self.gh.search_repositories('github3 language:python')
-            assert isinstance(next(repos), github3.repos.repo.Repository)
+            assert isinstance(next(repos),
+                              github3.search.RepositorySearchResult)
 
         assert isinstance(repos, github3.structs.SearchIterator)
 
     def test_search_repositories_with_text_match(self):
         """Test the ability to use the repository search endpoint"""
         self.token_login()
         cassette_name = self.cassette_name('search_repositories_text_match')
-        with self.recorder.use_cassette(cassette_name):
+        with self.recorder.use_cassette(cassette_name,
+                                        match_requests_on=self.match_on):
             repos = self.gh.search_repositories('github3 language:python',
                                                 text_match=True)
-            assert isinstance(next(repos), github3.repos.repo.Repository)
+            repo_result = next(repos)
+            assert isinstance(repo_result,
+                              github3.search.RepositorySearchResult)
 
         assert isinstance(repos, github3.structs.SearchIterator)
+        assert len(repo_result.text_matches) > 0
 
     def test_user(self):
         """Test the ability to retrieve a User"""
