diff rhodecode/tests/functional/test_compare.py @ 3484:75e563531350 beta

compare: drop unused rev_start and rev_end
author Mads Kiilerich <madski@unity3d.com>
date Mon, 04 Mar 2013 17:38:34 +0100
parents b3680a200f75
children 2053053e0882
line wrap: on
line diff
--- a/rhodecode/tests/functional/test_compare.py	Wed Mar 06 15:04:09 2013 +0100
+++ b/rhodecode/tests/functional/test_compare.py	Mon Mar 04 17:38:34 2013 +0100
@@ -215,20 +215,15 @@
         cs5 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\nline6\n',
                              message='commit6', vcs_type='hg', parent=cs4)
 
-        rev1 = 'tip'
-        rev2 = 'tip'
-
         response = self.app.get(url(controller='compare', action='index',
                                     repo_name=repo2.repo_name,
-                                    org_ref_type="tag",
-                                    org_ref=rev1,
+                                    org_ref_type="rev",
+                                    org_ref=cs1.short_id, # parent of cs2, in repo2
                                     other_repo=repo1.repo_name,
-                                    other_ref_type="tag",
-                                    other_ref=rev2,
-                                    rev_start=cs2.raw_id,
-                                    rev_end=cs4.raw_id,
+                                    other_ref_type="rev",
+                                    other_ref=cs4.short_id,
                                     ))
-        response.mustcontain('%s@%s -&gt; %s@%s' % (repo2.repo_name, cs2.short_id, repo1.repo_name, cs4.short_id))
+        response.mustcontain('%s@%s -&gt; %s@%s' % (repo2.repo_name, cs1.short_id, repo1.repo_name, cs4.short_id))
         response.mustcontain("""Showing 3 commits""")
         response.mustcontain("""1 file changed with 3 insertions and 0 deletions""")
 
@@ -280,21 +275,15 @@
                              message='commit5', vcs_type='hg', parent=cs3)
         cs5 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\nline6\n',
                              message='commit6', vcs_type='hg', parent=cs4)
-        rev1 = 'tip'
-        rev2 = 'tip'
-
         response = self.app.get(url(controller='compare', action='index',
-                                    repo_name=repo2.repo_name,
-                                    org_ref_type="tag",
-                                    org_ref=rev1,
-                                    other_repo=repo1.repo_name,
-                                    other_ref_type="tag",
-                                    other_ref=rev2,
-                                    rev_start=cs3.raw_id,
-                                    rev_end=cs5.raw_id,
+                                    repo_name=repo1.repo_name,
+                                    org_ref_type="rev",
+                                    org_ref=cs2.short_id, # parent of cs3, not in repo2
+                                    other_ref_type="rev",
+                                    other_ref=cs5.short_id,
                                     ))
 
-        response.mustcontain('%s@%s -&gt; %s@%s' % (repo2.repo_name, cs3.short_id, repo1.repo_name, cs5.short_id))
+        response.mustcontain('%s@%s -&gt; %s@%s' % (repo1.repo_name, cs2.short_id, repo1.repo_name, cs5.short_id))
         response.mustcontain("""Showing 3 commits""")
         response.mustcontain("""1 file changed with 3 insertions and 0 deletions""")