diff MoinMoin/converter/_tests/test_include.py @ 1018:dfbe65482a03

inserting {{MyWikiPage}} in middle of paragraph now makes valid html. inclusion of one-line page is shown inline. fixes #28
author "Luis Henrique Fagundes <lhfagundes@gmail.com>"
date Sat, 29 Oct 2011 20:09:50 -0200
parents d966ee4fba91
children afe0afe4e1a6
line wrap: on
line diff
--- a/MoinMoin/converter/_tests/test_include.py	Fri Oct 28 19:51:22 2011 -0200
+++ b/MoinMoin/converter/_tests/test_include.py	Sat Oct 29 20:09:50 2011 -0200
@@ -73,3 +73,41 @@
         page1 = MoinWiki.create(u'page1')
 
         page1._render_data()
+
+    def test_IncludeOfSingleLinePage(self):
+        # issue #28
+        update_item(u'page1', {CONTENTTYPE: u'text/x.moin.wiki'}, u'Content of page2 is "{{page2}}"')
+
+        update_item(u'page2', {CONTENTTYPE: u'text/x.moin.wiki'}, u'Single line')
+        rendered = MoinWiki.create(u'page1')._render_data()
+        assert 'Content of page2 is "Single line"' in rendered
+
+        update_item(u'page2', {CONTENTTYPE: u'text/x.moin.wiki'}, u'Two\n\nParagraphs')
+        rendered = MoinWiki.create(u'page1')._render_data()
+        assert '<p>Two</p>' in rendered
+        assert '<p>Paragraphs</p>' in rendered
+
+        update_item(u'page2', {CONTENTTYPE: u'text/x.moin.wiki'}, u"this text contains ''italic'' string")
+        rendered = MoinWiki.create(u'page1')._render_data()
+        assert 'Content of page2 is "this text contains' in rendered
+        assert '<em>italic</em>' in rendered
+
+        update_item(u'page1', {CONTENTTYPE: u'text/x.moin.wiki'}, u'Content of page2 is\n\n{{page2}}')
+        update_item(u'page2', {CONTENTTYPE: u'text/x.moin.wiki'}, u"Single Line")
+        rendered = MoinWiki.create(u'page1')._render_data()
+        assert 'Content of page2 is</p>' in rendered
+        assert '<p>Single Line</p>' in rendered
+
+        update_item(u'page1', {CONTENTTYPE: u'text/x.moin.wiki'}, u'Content of page2 is "{{page2}}"')
+        update_item(u'page2', {CONTENTTYPE: u'text/x.moin.wiki'}, u"|| table || cell ||")
+        rendered = MoinWiki.create(u'page1')._render_data()
+        assert 'Content of page2 is "</p>' in rendered
+        assert '<table>' in rendered
+        assert rendered.count('<table>') == 1
+
+        update_item(u'page1', {CONTENTTYPE: u'text/x.moin.wiki'}, u'Content of page2 is "{{page2}}"')
+        update_item(u'page2', {CONTENTTYPE: u'text/x.moin.wiki'}, u"|| this || has ||\n|| two || rows ||")
+        rendered = MoinWiki.create(u'page1')._render_data()
+        assert 'Content of page2 is "</p>' in rendered
+        assert '<table>' in rendered
+        assert rendered.count('<table>') == 1