test RepoHelper

Author: Rizziepit

elasticgit/search.py

@@ -172,21 +172,21 @@ def __init__(self, repo_url):
         if any([
                 repo_url.startswith('http://'),
                 repo_url.startswith('https://')]):
-            self.repo_obj = RemoteStorageManager(repo_url)
+            self.rsm = RemoteStorageManager(repo_url)
+            self.repo = None
         else:
-            self.repo_obj = Repo(repo_url)
+            self.rsm = None
+            self.repo = Repo(repo_url)
 
     def active_branch_name(self):
-        if isinstance(self.repo_obj, Repo):
-            return self.repo_obj.active_branch.name
-        return self.repo_obj.active_branch()
+        if self.repo:
+            return self.repo.active_branch.name
+        return self.rsm.active_branch()
 
     def default_index_prefix(self):
-        name = os.path.basename(self.repo_url)
-        name_no_ext, ext = os.path.splitext(name)
-        if ext in ('.git', '.json'):
-            return name_no_ext
-        return name
+        if self.repo:
+            return os.path.basename(self.repo_url)
+        return self.rsm.repo_name
 
 
 class SM(S):

elasticgit/tests/test_search.py

@@ -1,10 +1,15 @@
 import os
+import json
 from datetime import datetime
 
+from mock import patch
+from requests import Response
+
 from elasticutils import S as SBase
 
 from elasticgit.tests.base import ModelBaseTest, TestPerson
-from elasticgit.search import ReadOnlyModelMappingType, index_name, S, SM
+from elasticgit.search import (
+    ReadOnlyModelMappingType, index_name, S, SM, RepoHelper)
 
 
 class TestSearch(ModelBaseTest):
@@ -28,7 +33,7 @@ def test_init(self):
 
         s_obj = SM(TestPerson, in_=repo_workdirs)
         self.assertEqual(
-            [r.repo_obj for r in s_obj.repos],
+            [r.repo for r in s_obj.repos],
             [self.repo1, self.repo2])
         self.assertEqual(s_obj.index_prefixes, [
             os.path.basename(self.repo1.working_dir),
@@ -37,10 +42,26 @@ def test_init(self):
 
         s_obj = SM(TestPerson, in_=repo_workdirs, index_prefixes=['i1', 'i2'])
         self.assertEqual(
-            [r.repo_obj for r in s_obj.repos],
+            [r.repo for r in s_obj.repos],
             [self.repo1, self.repo2])
         self.assertEqual(s_obj.index_prefixes, ['i1', 'i2'])
 
+    def test_repo_helper(self):
+        helper = RepoHelper(self.repo1.working_dir)
+        self.assertEqual(helper.active_branch_name(), 'master')
+        self.assertEqual(
+            helper.default_index_prefix(),
+            os.path.basename(self.repo1.working_dir))
+
+        helper = RepoHelper('http://localhost/repos/repo1.json')
+        with patch.object(helper.rsm, 'mk_request') as mock:
+            response = Response()
+            response.encoding = 'utf-8'
+            response._content = json.dumps({'branch': 'foo'})
+            mock.return_value = response
+            self.assertEqual(helper.active_branch_name(), 'foo')
+            self.assertEqual(helper.default_index_prefix(), 'repo1')
+
     def test_get_repo_indexes(self):
         index1 = index_name(self.index_prefix1, self.repo1.active_branch.name)
         index2 = index_name(self.index_prefix2, self.repo2.active_branch.name)