[03/12] allura git commit: Updated tests

[br...@apache.org]

Updated tests


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

Branch: refs/heads/db/3593
Commit: 190a1cbc8e8e3c9368061bd886845d20a7406c3a
Parents: 620c995
Author: Rohan Verma <ro...@gmail.com>
Authored: Fri Jun 24 19:36:13 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Jul 11 11:05:39 2016 -0400

----------------------------------------------------------------------
 ForgeGit/forgegit/tests/functional/test_controllers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/190a1cbc/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 8e09047..fc0b755 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -648,7 +648,7 @@ class TestFork(_TestCase):
         assert 'git merge {}'.format(c_id) in merge_instructions
         assert_in('less than 1 minute ago', r)
 
-        merge_form = r.html.find('form', action='merge')
+        merge_form = r.html.find('div', {'class': 'merge-help-text merge-ok'})
         assert merge_form
         assert_in('Merge request has no conflicts. You can merge automatically.', merge_form.getText())