kallithea Changeset - f0e19116f154

Changeset - f0e19116f154

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-11-16 21:09:50
marcin@python-works.com

fixed file history tests

2 files changed with 28 insertions and 17 deletions:

rhodecode/controllers/files.py

rhodecode/tests/functional/test_files.py

0 comments (0 inline, 0 general)

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -551,8 +551,6 @@ class FilesController(BaseRepoController @@
         :param changesets: if passed don't calculate history and take
             changesets defined in this list
         """
         import time
         s = time.time()
         # calculate history based on tip
         tip_cs = c.rhodecode_repo.get_changeset()
         if changesets is None:
@@ @@ -561,7 +559,6 @@ class FilesController(BaseRepoController @@
             except (NodeDoesNotExistError, ChangesetError):
                 #this node is not present at tip !
                 changesets = cs.get_file_history(f_path)
         print time.time()-s
         hist_l = []
         changesets_group = ([], _("Changesets"))
@@ @@ -571,9 +568,8 @@ class FilesController(BaseRepoController @@
         for chs in changesets:
             #_branch = '(%s)' % chs.branch if _hg else ''
             _branch = chs.branch
             n_desc = 'r%s:%s %s' % (chs.revision, chs.short_id, _branch)
+            n_desc = 'r%s:%s (%s)' % (chs.revision, chs.short_id, _branch)
             changesets_group[0].append((chs.raw_id, n_desc,))
         print time.time()-s
         hist_l.append(changesets_group)
         for name, chs in c.rhodecode_repo.branches.items():
@@ @@ -583,7 +579,7 @@ class FilesController(BaseRepoController @@
         for name, chs in c.rhodecode_repo.tags.items():
             tags_group[0].append((chs, name),)
         hist_l.append(tags_group)
-        print time.time()-s
         return hist_l, changesets
     @LoginRequired()

rhodecode/tests/functional/test_files.py

➞

Show inline comments

@@ @@ -73,6 +73,22 @@ class TestFilesController(TestController @@
                                     revision='27cd5cce30c96924232dffcd24178a07ffeb5dfc',
                                     f_path='vcs/nodes.py'))
         response.mustcontain("""<div class="commit">Partially implemented <a class="issue-tracker-link" href="https://myissueserver.com/vcs_test_hg/issue/16">#16</a>. filecontent/commit message/author/node name are safe_unicode now.
 In addition some other __str__ are unicode as well
 Added test for unicode
 Improved test to clone into uniq repository.
 removed extra unicode conversion in diff.</div>
 """)
         response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")
     def test_file_source_history(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='history',
                                     repo_name=HG_REPO,
                                     revision='27cd5cce30c96924232dffcd24178a07ffeb5dfc',
                                     f_path='vcs/nodes.py'),
                                 extra_environ={'HTTP_X_PARTIAL_XHR': '1'},)
         #test or history
         response.mustcontain("""<optgroup label="Changesets">
 <option selected="selected" value="8911406ad776fdd3d0b9932a2e89677e57405a48">r167:8911406ad776 (default)</option>
@@ @@ -123,15 +139,6 @@ class TestFilesController(TestController @@
 </optgroup>
 """)
         response.mustcontain("""<div class="commit">Partially implemented <a class="issue-tracker-link" href="https://myissueserver.com/vcs_test_hg/issue/16">#16</a>. filecontent/commit message/author/node name are safe_unicode now.
 In addition some other __str__ are unicode as well
 Added test for unicode
 Improved test to clone into uniq repository.
 removed extra unicode conversion in diff.</div>
 """)
         response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")
     def test_file_annotation(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='index',
@@ @@ -140,6 +147,16 @@ removed extra unicode conversion in diff @@
                                     f_path='vcs/nodes.py',
                                     annotate=True))
         response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")
     def test_file_annotation_history(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='history',
                                     repo_name=HG_REPO,
                                     revision='27cd5cce30c96924232dffcd24178a07ffeb5dfc',
                                     f_path='vcs/nodes.py',
                                     annotate=True),
                                 extra_environ={'HTTP_X_PARTIAL_XHR': '1'})
         response.mustcontain("""<optgroup label="Changesets">
 <option selected="selected" value="8911406ad776fdd3d0b9932a2e89677e57405a48">r167:8911406ad776 (default)</option>
@@ @@ -189,8 +206,6 @@ removed extra unicode conversion in diff @@
 <option value="eb3a60fc964309c1a318b8dfe26aa2d1586c85ae">0.1.1</option>
 </optgroup>""")
         response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")
     def test_file_annotation_git(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='index',

0 comments (0 inline, 0 general)