allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [09/18] allura git commit: [#8088] Fix failing tests due to missing closing form tag. Update a test to match new html
Date Wed, 13 Jul 2016 19:30:06 GMT
[#8088] Fix failing tests due to missing closing form tag. Update a test to match new html


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

Branch: refs/heads/master
Commit: 407997cdc5419195ce716450ac8babf0b2e9f332
Parents: 9a93a45
Author: Rohan Verma <rohanverma2004@gmail.com>
Authored: Tue Jun 21 22:28:00 2016 +0530
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Wed Jul 13 15:03:29 2016 -0400

----------------------------------------------------------------------
 Allura/allura/templates/widgets/moderate_post.html | 1 +
 Allura/allura/tests/functional/test_discuss.py     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/407997cd/Allura/allura/templates/widgets/moderate_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/moderate_post.html b/Allura/allura/templates/widgets/moderate_post.html
index 15048a6..9c507e4 100644
--- a/Allura/allura/templates/widgets/moderate_post.html
+++ b/Allura/allura/templates/widgets/moderate_post.html
@@ -34,4 +34,5 @@
         <input type="hidden" name="spam" value="True"/>
         <a href="" class="moderate_post spam little_link icon btn ui-button ui-widget
ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-exclamation"
aria-hidden="true"></i></span></a>
         {{lib.csrf_token()}}
+    </form>
 <br/>

http://git-wip-us.apache.org/repos/asf/allura/blob/407997cd/Allura/allura/tests/functional/test_discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_discuss.py b/Allura/allura/tests/functional/test_discuss.py
index 719e57a..d17b57b 100644
--- a/Allura/allura/tests/functional/test_discuss.py
+++ b/Allura/allura/tests/functional/test_discuss.py
@@ -149,9 +149,9 @@ class TestDiscuss(TestDiscussBase):
 
     def test_spam_link(self):
         r = self._make_post('Test post')
-        assert '<span>Spam</span>' in r
+        assert '<span><i class="fa fa-exclamation" aria-hidden="true"></i>
Spam</span>' in r
         r = self.app.get('/wiki/Home/', extra_environ={'username': 'test-user-1'})
-        assert '<span>Spam</span>' not in r, 'User without moderate perm must
not see Spam link'
+        assert '<span><i class="fa fa-exclamation" aria-hidden="true"></i>
Spam</span>' not in r, 'User without moderate perm must not see Spam link'
 
     @patch('allura.controllers.discuss.g.spam_checker.submit_spam')
     def test_moderate(self, submit_spam):


Mime
View raw message