incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [2/3] git commit: [#4665] ticket:401 added test for MergeRequest help text
Date Thu, 08 Aug 2013 14:03:58 GMT
[#4665] ticket:401 added test for MergeRequest help text


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/37b8fff8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/37b8fff8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/37b8fff8

Branch: refs/heads/master
Commit: 37b8fff82e4b555ce632ff3aeca8df19b4f09a34
Parents: 439222c
Author: Anton Kasyanov <mind1master@gmail.com>
Authored: Wed Jul 31 14:00:31 2013 +0300
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Wed Aug 7 22:35:27 2013 +0000

----------------------------------------------------------------------
 ForgeGit/forgegit/tests/functional/test_controllers.py | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37b8fff8/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 6eafcb6..d8c3f2c 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -501,6 +501,10 @@ class TestFork(_TestCase):
         assert_equal(rev_links[0].getText(), '[%s]' % c_id[:6])
         assert_equal(browse_links[0].get('href'), '/p/test2/code/ci/%s/tree' % c_id)
         assert_equal(browse_links[0].getText(), 'Tree')
+        merge_instructions = r.html.findAll('textarea')[0].getText()
+        assert 'git checkout master' in merge_instructions
+        assert 'git fetch git://git.localhost/p/test2/code master' in merge_instructions
+        assert 'git merge {}'.format(c_id) in merge_instructions
 
     def test_merge_request_list_view(self):
         r, mr_num = self._request_merge()


Mime
View raw message