You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/03/05 23:42:12 UTC

[2/50] [abbrv] git commit: [#5845] ticket:280 Updated tests for markdown macros

[#5845] ticket:280 Updated tests for markdown macros


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

Branch: refs/heads/si/5453
Commit: a04b82f009d0218b4d0605e7c72655634d1e832e
Parents: 67d38d7
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Thu Feb 21 18:21:39 2013 +0200
Committer: Dave Brondsema <db...@geek.net>
Committed: Thu Feb 28 22:17:19 2013 +0000

----------------------------------------------------------------------
 Allura/allura/tests/test_globals.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a04b82f0/Allura/allura/tests/test_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index 787dd2e..eb2a828 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -121,7 +121,7 @@ def test_macros():
 
     c.project = curr_project
     r = g.markdown_wiki.convert('[[download_button]]')
-    assert_equal(r, '<div class="markdown_content"><p><span class="download-button-%s" style="margin-bottom: 1em; display: block;"></span></p></div>' % p_test._id)
+    assert_equal(r, '<div class="markdown_content"><p><span class="download-button-%s" style="margin-bottom: 1em; display: block;"></span></p>\n</div>' % p_test._id)
     h.set_context('--init--', 'wiki', neighborhood='Projects')
     r = g.markdown_wiki.convert('[[neighborhood_feeds tool_name=Wiki]]')
     assert 'WikiPage Home modified by' in r, r
@@ -149,7 +149,7 @@ def test_macros():
 
 def test_macro_project_admins():
     r = g.markdown_wiki.convert('[[project_admins]]')
-    assert_equal(r, '<div class="markdown_content"><p><a href="/u/test-admin/">Test Admin</a><br /></p></div>')
+    assert_equal(r, '<div class="markdown_content"><p><a href="/u/test-admin/">Test Admin</a><br /></p>\n</div>')
 
 def test_macro_project_admins_one_br():
     p_nbhd = M.Neighborhood.query.get(name='Projects')