aboutsummaryrefslogtreecommitdiff
path: root/rhodecode/tests
diff options
context:
space:
mode:
authorMarcin Kuzminski <marcin@python-works.com>2013-02-04 02:07:38 +0100
committerMarcin Kuzminski <marcin@python-works.com>2013-02-04 02:07:38 +0100
commitdcb8f5bb682b456d4bd2fa4c772f8076865f8ea7 (patch)
tree6300ed33ad99b301cfc31189dc715d2ca86c7465 /rhodecode/tests
parentca7a085c9d349badd917a528db76a606a6aba962 (diff)
fixed tests after last refactoring
--HG-- branch : beta
Diffstat (limited to 'rhodecode/tests')
-rw-r--r--rhodecode/tests/functional/test_compare.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/rhodecode/tests/functional/test_compare.py b/rhodecode/tests/functional/test_compare.py
index 6910e0a0..b4538301 100644
--- a/rhodecode/tests/functional/test_compare.py
+++ b/rhodecode/tests/functional/test_compare.py
@@ -108,13 +108,12 @@ class TestCompareController(TestController):
response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))
response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))
## files
- response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2))
+ response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
finally:
RepoModel().delete(r2_id)
RepoModel().delete(r1_id)
-
def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self):
self.log_user()
@@ -166,7 +165,7 @@ class TestCompareController(TestController):
response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))
response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))
## files
- response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2))
+ response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
finally:
RepoModel().delete(r2_id)