Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 014CF10465 for ; Thu, 8 Aug 2013 14:03:58 +0000 (UTC) Received: (qmail 90797 invoked by uid 500); 8 Aug 2013 14:03:57 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 90748 invoked by uid 500); 8 Aug 2013 14:03:57 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 90723 invoked by uid 99); 8 Aug 2013 14:03:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Aug 2013 14:03:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6CC82835E65; Thu, 8 Aug 2013 14:03:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org Date: Thu, 08 Aug 2013 14:03:58 -0000 Message-Id: <849294b57e0a43a8bbff2fd918fad84c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: [#4665] ticket:401 added test for MergeRequest help text [#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 Authored: Wed Jul 31 14:00:31 2013 +0300 Committer: Cory Johns 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()