summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-06-04 17:12:59 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-06-04 17:12:59 +0000
commit735db3dae5c16d13bf7ae3af992bb9b23644a4fa (patch)
tree76d772535a48f9a7b39fcdd4c1fec2b6250116ac /test
parenta77fb3b59109a296605fa435db349c3b1eb442eb (diff)
downloadredmine-735db3dae5c16d13bf7ae3af992bb9b23644a4fa.tar.gz
redmine-735db3dae5c16d13bf7ae3af992bb9b23644a4fa.zip
Allow empty cells in wiki tables.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1490 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r--test/unit/helpers/application_helper_test.rb29
1 files changed, 23 insertions, 6 deletions
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index f8bf4a602..937d8aa20 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -152,12 +152,7 @@ class ApplicationHelperTest < HelperTestCase
end
def test_wiki_links_in_tables
- to_test = {"|Cell 11|Cell 12|Cell 13|\n|Cell 21|Cell 22||\n|Cell 31||Cell 33|" =>
- '<tr><td>Cell 11</td><td>Cell 12</td><td>Cell 13</td></tr>' +
- '<tr><td>Cell 21</td><td>Cell 22</td></tr>' +
- '<tr><td>Cell 31</td><td>Cell 33</td></tr>',
-
- "|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|" =>
+ to_test = {"|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|" =>
'<tr><td><a href="/wiki/ecookbook/Page" class="wiki-page new">Link title</a></td>' +
'<td><a href="/wiki/ecookbook/Other_Page" class="wiki-page new">Other title</a></td>' +
'</tr><tr><td>Cell 21</td><td><a href="/wiki/ecookbook/Last_page" class="wiki-page new">Last page</a></td></tr>'
@@ -218,6 +213,28 @@ EXPECTED
assert_equal expected.gsub(%r{\s+}, ''), textilizable(raw).gsub(%r{\s+}, '')
end
+ def test_table
+ raw = <<-RAW
+This is a table with empty cells:
+
+|cell11|cell12||
+|cell21||cell23|
+|cell31|cell32|cell33|
+RAW
+
+ expected = <<-EXPECTED
+<p>This is a table with empty cells:</p>
+
+<table>
+ <tr><td>cell11</td><td>cell12</td><td></td></tr>
+ <tr><td>cell21</td><td></td><td>cell23</td></tr>
+ <tr><td>cell31</td><td>cell32</td><td>cell33</td></tr>
+</table>
+EXPECTED
+
+ assert_equal expected.gsub(%r{\s+}, ''), textilizable(raw).gsub(%r{\s+}, '')
+ end
+
def test_macro_hello_world
text = "{{hello_world}}"
assert textilizable(text).match(/Hello world!/)