Rails 2.3.5
Upgrade to Rails 2.3.5. Also work around this bug: https://rails.lighthouseapp.com/projects/8994/tickets/3524 created by the aforementioned Rails release.
This commit is contained in:
Jacques Distler
parent
a6429f8c22
commit
e3832c6f79
187 changed files with 2316 additions and 891 deletions
|
|
@ -212,11 +212,11 @@ class AdminControllerTest < ActionController::TestCase
|
|||
def test_remove_orphaned_pages
|
||||
@wiki.system.update_attribute(:password, 'pswd')
|
||||
page_order = [@home, pages(:my_way), @oak, pages(:smart_engine), pages(:that_way), @liquor]
|
||||
test_renderer(@web.page('liquor').revisions.last).display_content(true)
|
||||
x_test_renderer(@web.page('liquor').revisions.last).display_content(true)
|
||||
orphan_page_linking_to_oak_and_redirecting_to_liquor = @wiki.write_page('wiki1', 'Pine',
|
||||
"Refers to [[Oak]] and to [[booze]].\n" +
|
||||
"category: trees",
|
||||
Time.now, Author.new('TreeHugger', '127.0.0.2'), test_renderer)
|
||||
Time.now, Author.new('TreeHugger', '127.0.0.2'), x_test_renderer)
|
||||
|
||||
r = process('remove_orphaned_pages', 'web' => 'wiki1', 'system_password_orphaned' => 'pswd')
|
||||
|
||||
|
|
@ -249,7 +249,7 @@ class AdminControllerTest < ActionController::TestCase
|
|||
orphan_page_linking_to_oak = @wiki.write_page('wiki1', 'Pine',
|
||||
"Refers to [[Oak]].\n" +
|
||||
"category: trees",
|
||||
Time.now, Author.new('TreeHugger', '127.0.0.2'), test_renderer)
|
||||
Time.now, Author.new('TreeHugger', '127.0.0.2'), x_test_renderer)
|
||||
|
||||
r = process('remove_orphaned_pages_in_category', 'web' => 'wiki1', 'category' => 'trees','system_password_orphaned_in_category' => 'pswd')
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ class WikiControllerTest < ActionController::TestCase
|
|||
def test_authors
|
||||
@wiki.write_page('wiki1', 'BreakSortingOrder',
|
||||
"This page breaks the accidentally correct sorting order of authors",
|
||||
Time.now, Author.new('BreakingTheOrder', '127.0.0.2'), test_renderer)
|
||||
Time.now, Author.new('BreakingTheOrder', '127.0.0.2'), x_test_renderer)
|
||||
|
||||
r = process('authors', 'web' => 'wiki1')
|
||||
|
||||
|
|
@ -106,7 +106,7 @@ class WikiControllerTest < ActionController::TestCase
|
|||
def test_edit_page_with_special_symbols
|
||||
@wiki.write_page('wiki1', 'With : Special /> symbols',
|
||||
'This page has special symbols in the name', Time.now, Author.new('Special', '127.0.0.3'),
|
||||
test_renderer)
|
||||
x_test_renderer)
|
||||
|
||||
r = process 'edit', 'web' => 'wiki1', 'id' => 'With : Special /> symbols'
|
||||
assert_response(:success)
|
||||
|
|
@ -118,7 +118,7 @@ class WikiControllerTest < ActionController::TestCase
|
|||
def test_export_xhtml
|
||||
@request.accept = 'application/xhtml+xml'
|
||||
# rollback homepage to a version that is easier to match
|
||||
@home.rollback(0, Time.now, 'Rick', test_renderer)
|
||||
@home.rollback(0, Time.now, 'Rick', x_test_renderer)
|
||||
r = process 'export_html', 'web' => 'wiki1'
|
||||
|
||||
assert_response(:success, bypass_body_parsing = true)
|
||||
|
|
@ -149,7 +149,7 @@ class WikiControllerTest < ActionController::TestCase
|
|||
def test_export_html
|
||||
@request.accept = 'tex/html'
|
||||
# rollback homepage to a version that is easier to match
|
||||
@home.rollback(0, Time.now, 'Rick', test_renderer)
|
||||
@home.rollback(0, Time.now, 'Rick', x_test_renderer)
|
||||
r = process 'export_html', 'web' => 'wiki1'
|
||||
|
||||
assert_response(:success, bypass_body_parsing = true)
|
||||
|
|
@ -423,7 +423,7 @@ class WikiControllerTest < ActionController::TestCase
|
|||
page2 = @wiki.write_page('wiki1', 'Page2',
|
||||
"Page2 contents.\n" +
|
||||
"category: categorized",
|
||||
Time.now, Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)
|
||||
Time.now, Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
|
||||
|
||||
r = process('recently_revised', 'web' => 'wiki1')
|
||||
assert_response(:success)
|
||||
|
|
@ -508,7 +508,7 @@ class WikiControllerTest < ActionController::TestCase
|
|||
|
||||
def test_atom_with_headlines
|
||||
@title_with_spaces = @wiki.write_page('wiki1', 'Title With Spaces',
|
||||
'About spaces', 1.hour.ago, Author.new('TreeHugger', '127.0.0.2'), test_renderer)
|
||||
'About spaces', 1.hour.ago, Author.new('TreeHugger', '127.0.0.2'), x_test_renderer)
|
||||
|
||||
@request.host = 'localhost'
|
||||
@request.port = 8080
|
||||
|
|
@ -622,7 +622,7 @@ class WikiControllerTest < ActionController::TestCase
|
|||
# Since we're declaring <title> to be of type="html", the content is unescaped once before interpreting.
|
||||
# Evidently, the desired behaviour is that the final result be HTML-encoded. Hence the double-encoding here.
|
||||
@wiki.write_page('wiki1', 'Title&With&Ampersands',
|
||||
'About spaces', 1.hour.ago, Author.new('NitPicker', '127.0.0.3'), test_renderer)
|
||||
'About spaces', 1.hour.ago, Author.new('NitPicker', '127.0.0.3'), x_test_renderer)
|
||||
|
||||
r = process 'atom_with_headlines', 'web' => 'wiki1'
|
||||
|
||||
|
|
@ -633,7 +633,7 @@ class WikiControllerTest < ActionController::TestCase
|
|||
def test_atom_timestamp
|
||||
new_page = @wiki.write_page('wiki1', 'PageCreatedAtTheBeginningOfCtime',
|
||||
'Created on 1 Jan 1970 at 0:00:00 Z', Time.at(0), Author.new('NitPicker', '127.0.0.3'),
|
||||
test_renderer)
|
||||
x_test_renderer)
|
||||
|
||||
r = process 'atom_with_headlines', 'web' => 'wiki1'
|
||||
assert_tag :tag =>'published',
|
||||
|
|
@ -921,7 +921,7 @@ class WikiControllerTest < ActionController::TestCase
|
|||
|
||||
def test_show_page_with_multiple_revisions
|
||||
@wiki.write_page('wiki1', 'HomePage', 'Second revision of the HomePage end', Time.now,
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
|
||||
|
||||
r = process('show', 'id' => 'HomePage', 'web' => 'wiki1')
|
||||
|
||||
|
|
@ -931,7 +931,7 @@ class WikiControllerTest < ActionController::TestCase
|
|||
|
||||
def test_recursive_include
|
||||
@wiki.write_page('wiki1', 'HomePage', 'Self-include: [[!include HomePage]]', Time.now,
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
|
||||
|
||||
r = process('show', 'id' => 'HomePage', 'web' => 'wiki1')
|
||||
|
||||
|
|
@ -941,9 +941,9 @@ class WikiControllerTest < ActionController::TestCase
|
|||
|
||||
def test_recursive_include_II
|
||||
@wiki.write_page('wiki1', 'Foo', "extra fun [[!include HomePage]]", Time.now,
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
|
||||
@wiki.write_page('wiki1', 'HomePage', "Recursive-include:\n\n[[!include Foo]]", Time.now,
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
|
||||
|
||||
r = process('show', 'id' => 'HomePage', 'web' => 'wiki1')
|
||||
|
||||
|
|
@ -953,11 +953,11 @@ class WikiControllerTest < ActionController::TestCase
|
|||
|
||||
def test_recursive_include_III
|
||||
@wiki.write_page('wiki1', 'Bar', "extra fun\n\n[[!include HomePage]]", Time.now,
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
|
||||
@wiki.write_page('wiki1', 'Foo', "[[!include Bar]]\n\n[[!include Bar]]", Time.now,
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
|
||||
@wiki.write_page('wiki1', 'HomePage', "Recursive-include:\n\n[[!include Foo]]", Time.now,
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
|
||||
|
||||
r = process('show', 'id' => 'HomePage', 'web' => 'wiki1')
|
||||
|
||||
|
|
@ -967,11 +967,11 @@ class WikiControllerTest < ActionController::TestCase
|
|||
|
||||
def test_nonrecursive_include
|
||||
@wiki.write_page('wiki1', 'Bar', "extra fun\n\n[[HomePage]]", Time.now,
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
|
||||
@wiki.write_page('wiki1', 'Foo', "[[!include Bar]]\n\n[[!include Bar]]", Time.now,
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
|
||||
@wiki.write_page('wiki1', 'HomePage', "Nonrecursive-include:\n\n[[!include Foo]]", Time.now,
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)
|
||||
Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
|
||||
|
||||
r = process('show', 'id' => 'HomePage', 'web' => 'wiki1')
|
||||
|
||||
|
|
@ -1258,7 +1258,7 @@ HisWay would be MyWay $\sin(x) \includegraphics[width=3em]{foo}$ in kinda ThatWa
|
|||
def test_tex_with_blackboard_digits
|
||||
@wiki.write_page('wiki1', 'Page2',
|
||||
"Page2 contents $\\mathbb{01234}$.\n",
|
||||
Time.now, Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)
|
||||
Time.now, Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
|
||||
r = process('tex', 'web' => 'wiki1', 'id' => 'Page2')
|
||||
assert_response(:success)
|
||||
|
||||
|
|
|
|||
|
|
@ -43,13 +43,13 @@ class Test::Unit::TestCase
|
|||
(1..30).each do |i|
|
||||
@wiki.write_page('wiki1', "page#{i}", "Test page #{i}\ncategory: test",
|
||||
Time.local(1976, 10, i, 12, 00, 00), Author.new('Dema', '127.0.0.2'),
|
||||
test_renderer)
|
||||
x_test_renderer)
|
||||
end
|
||||
end
|
||||
@web = Web.find(@web.id)
|
||||
end
|
||||
|
||||
def test_renderer(revision = nil)
|
||||
def x_test_renderer(revision = nil)
|
||||
PageRenderer.setup_url_generator(StubUrlGenerator.new)
|
||||
PageRenderer.new(revision)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@ class PageRendererTest < ActiveSupport::TestCase
|
|||
|
||||
def test_wiki_word_linking
|
||||
@web.add_page('SecondPage', 'Yo, yo. Have you EverBeenHated',
|
||||
Time.now, 'DavidHeinemeierHansson', test_renderer)
|
||||
Time.now, 'DavidHeinemeierHansson', x_test_renderer)
|
||||
|
||||
assert_equal("<p>Yo, yo. Have you <span class='newWikiWord'>Ever Been Hated" +
|
||||
"<a href='../show/EverBeenHated'>?</a></span></p>",
|
||||
rendered_content(@web.page("SecondPage")))
|
||||
|
||||
@web.add_page('EverBeenHated', 'Yo, yo. Have you EverBeenHated', Time.now,
|
||||
'DavidHeinemeierHansson', test_renderer)
|
||||
'DavidHeinemeierHansson', x_test_renderer)
|
||||
assert_equal("<p>Yo, yo. Have you <a class='existingWikiWord' " +
|
||||
"href='../show/EverBeenHated'>Ever Been Hated</a></p>",
|
||||
rendered_content(@web.page("SecondPage")))
|
||||
|
|
@ -30,18 +30,18 @@ class PageRendererTest < ActiveSupport::TestCase
|
|||
|
||||
def test_wiki_words
|
||||
assert_equal %w( HisWay MyWay SmartEngine SmartEngineGUI ThatWay ),
|
||||
test_renderer(@revision).wiki_words.sort
|
||||
x_test_renderer(@revision).wiki_words.sort
|
||||
|
||||
@wiki.write_page('wiki1', 'NoWikiWord', 'hey you!', Time.now, 'Me', test_renderer)
|
||||
assert_equal [], test_renderer(@wiki.read_page('wiki1', 'NoWikiWord').revisions.last).wiki_words
|
||||
@wiki.write_page('wiki1', 'NoWikiWord', 'hey you!', Time.now, 'Me', x_test_renderer)
|
||||
assert_equal [], x_test_renderer(@wiki.read_page('wiki1', 'NoWikiWord').revisions.last).wiki_words
|
||||
end
|
||||
|
||||
def test_existing_pages
|
||||
assert_equal %w( MyWay SmartEngine ThatWay ), test_renderer(@revision).existing_pages.sort
|
||||
assert_equal %w( MyWay SmartEngine ThatWay ), x_test_renderer(@revision).existing_pages.sort
|
||||
end
|
||||
|
||||
def test_unexisting_pages
|
||||
assert_equal %w( HisWay SmartEngineGUI ), test_renderer(@revision).unexisting_pages.sort
|
||||
assert_equal %w( HisWay SmartEngineGUI ), x_test_renderer(@revision).unexisting_pages.sort
|
||||
end
|
||||
|
||||
def test_content_with_wiki_links
|
||||
|
|
@ -56,7 +56,7 @@ class PageRendererTest < ActiveSupport::TestCase
|
|||
"<a class='existingWikiWord' href='../show/SmartEngine'>Smart Engine</a> in that " +
|
||||
"<span class='newWikiWord'>Smart Engine GUI" +
|
||||
"<a href='../show/SmartEngineGUI'>?</a></span></p>",
|
||||
test_renderer(@revision).display_content
|
||||
x_test_renderer(@revision).display_content
|
||||
end
|
||||
|
||||
def test_markdown
|
||||
|
|
@ -349,7 +349,7 @@ END_THM
|
|||
|
||||
assert_equal "<tt>hello</tt> that <span class='newWikiWord'>Smart Engine GUI" +
|
||||
"<a href='../show/SmartEngineGUI'>?</a></span>\n\n",
|
||||
test_renderer(@revision).display_content
|
||||
x_test_renderer(@revision).display_content
|
||||
end
|
||||
|
||||
# def test_content_with_auto_links
|
||||
|
|
@ -555,7 +555,7 @@ END_THM
|
|||
%{<a class='existingWikiWord' href='MyWay.html'>My Way</a> OverThere \342\200\223 see } +
|
||||
"<a class='existingWikiWord' href='SmartEngine.html'>Smart Engine</a> in that " +
|
||||
"<span class='newWikiWord'>Smart Engine GUI</span></p>",
|
||||
test_renderer(@revision).display_content_for_export
|
||||
x_test_renderer(@revision).display_content_for_export
|
||||
end
|
||||
|
||||
def test_double_replacing
|
||||
|
|
@ -564,21 +564,21 @@ END_THM
|
|||
"<a href='../show/VersionHistory'>?</a></span></p>\n\n<p>cry " +
|
||||
"<span class='newWikiWord'>Version History<a href='../show/VersionHistory'>?</a>" +
|
||||
'</span></p>',
|
||||
test_renderer(@revision).display_content
|
||||
x_test_renderer(@revision).display_content
|
||||
|
||||
@revision.content = "f\r\nVersionHistory\r\n\r\ncry VersionHistory"
|
||||
assert_equal "<p>f <span class='newWikiWord'>Version History" +
|
||||
"<a href='../show/VersionHistory'>?</a></span></p>\n\n<p>cry " +
|
||||
"<span class='newWikiWord'>Version History<a href='../show/VersionHistory'>?</a>" +
|
||||
"</span></p>",
|
||||
test_renderer(@revision).display_content
|
||||
x_test_renderer(@revision).display_content
|
||||
end
|
||||
|
||||
def test_difficult_wiki_words
|
||||
@revision.content = "[[It's just awesome GUI!]]"
|
||||
assert_equal "<p><span class='newWikiWord'>It's just awesome GUI!" +
|
||||
"<a href='../show/It%27s+just+awesome+GUI%21'>?</a></span></p>",
|
||||
test_renderer(@revision).display_content
|
||||
x_test_renderer(@revision).display_content
|
||||
end
|
||||
|
||||
def test_revisions_diff
|
||||
|
|
@ -589,7 +589,7 @@ END_THM
|
|||
|
||||
@page.reload
|
||||
assert_equal "<p><span> What a<del class='diffmod'> blue</del><ins class='diffmod'> red" +
|
||||
"</ins> and lovely morning<ins class='diffins'> today</ins></span></p>", test_renderer(@page.revisions.last).display_diff
|
||||
"</ins> and lovely morning<ins class='diffins'> today</ins></span></p>", x_test_renderer(@page.revisions.last).display_diff
|
||||
end
|
||||
|
||||
def test_nowiki_sanitization
|
||||
|
|
@ -687,7 +687,7 @@ END_THM
|
|||
|
||||
def test_references_creation_links
|
||||
new_page = @web.add_page('NewPage', 'HomePage NewPage',
|
||||
Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', test_renderer)
|
||||
Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', x_test_renderer)
|
||||
|
||||
references = new_page.wiki_references(true)
|
||||
assert_equal 2, references.size
|
||||
|
|
@ -699,7 +699,7 @@ END_THM
|
|||
|
||||
def test_references_creation_includes
|
||||
new_page = @web.add_page('NewPage', '[[!include IncludedPage]]',
|
||||
Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', test_renderer)
|
||||
Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', x_test_renderer)
|
||||
|
||||
references = new_page.wiki_references(true)
|
||||
assert_equal 1, references.size
|
||||
|
|
@ -709,7 +709,7 @@ END_THM
|
|||
|
||||
def test_references_creation_categories
|
||||
new_page = @web.add_page('NewPage', "Foo\ncategory: NewPageCategory",
|
||||
Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', test_renderer)
|
||||
Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', x_test_renderer)
|
||||
|
||||
references = new_page.wiki_references(true)
|
||||
assert_equal 1, references.size
|
||||
|
|
@ -719,7 +719,7 @@ END_THM
|
|||
|
||||
def test_references_creation_sanitized_categories
|
||||
new_page = @web.add_page('NewPage', "Foo\ncategory: <script>alert('XSS');</script>",
|
||||
Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', test_renderer)
|
||||
Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', x_test_renderer)
|
||||
|
||||
references = new_page.wiki_references(true)
|
||||
assert_equal 1, references.size
|
||||
|
|
@ -728,49 +728,49 @@ END_THM
|
|||
end
|
||||
|
||||
def test_rendering_included_page_under_different_modes
|
||||
included = @web.add_page('Included', 'link to HomePage', Time.now, 'AnAuthor', test_renderer)
|
||||
main = @web.add_page('Main', '[[!include Included]]', Time.now, 'AnAuthor', test_renderer)
|
||||
included = @web.add_page('Included', 'link to HomePage', Time.now, 'AnAuthor', x_test_renderer)
|
||||
main = @web.add_page('Main', '[[!include Included]]', Time.now, 'AnAuthor', x_test_renderer)
|
||||
|
||||
assert_equal "<p>link to <a class='existingWikiWord' href='../show/HomePage'>Home Page</a></p>",
|
||||
test_renderer(main).display_content
|
||||
x_test_renderer(main).display_content
|
||||
assert_equal "<p>link to <a class='existingWikiWord' href='../published/HomePage'>Home Page</a></p>",
|
||||
test_renderer(main).display_published
|
||||
x_test_renderer(main).display_published
|
||||
assert_equal "<p>link to <a class='existingWikiWord' href='HomePage.html'>Home Page</a></p>",
|
||||
test_renderer(main).display_content_for_export
|
||||
x_test_renderer(main).display_content_for_export
|
||||
end
|
||||
|
||||
def test_rendering_included_page_backslashes_in_equations
|
||||
included = @web.add_page('Included', '\\\\ $\begin{matrix} a \\\\ b\end{matrix}$', Time.now, 'AnAuthor', test_renderer)
|
||||
main = @web.add_page('Main', '[[!include Included]]', Time.now, 'AnAuthor', test_renderer)
|
||||
included = @web.add_page('Included', '\\\\ $\begin{matrix} a \\\\ b\end{matrix}$', Time.now, 'AnAuthor', x_test_renderer)
|
||||
main = @web.add_page('Main', '[[!include Included]]', Time.now, 'AnAuthor', x_test_renderer)
|
||||
|
||||
assert_equal "<p>\\ <math class='maruku-mathml' display='inline' " +
|
||||
"xmlns='http://www.w3.org/1998/Math/MathML'><mrow><mtable rowspacing='0.5ex'>" +
|
||||
"<mtr><mtd><mi>a</mi></mtd></mtr> <mtr><mtd><mi>b</mi></mtd></mtr></mtable>" +
|
||||
"</mrow></math></p>",
|
||||
test_renderer(main).display_content
|
||||
x_test_renderer(main).display_content
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def add_sample_pages
|
||||
@in_love = @web.add_page('EverBeenInLove', 'Who am I me',
|
||||
Time.local(2004, 4, 4, 16, 50), 'DavidHeinemeierHansson', test_renderer)
|
||||
Time.local(2004, 4, 4, 16, 50), 'DavidHeinemeierHansson', x_test_renderer)
|
||||
@hated = @web.add_page('EverBeenHated', 'I am me EverBeenHated',
|
||||
Time.local(2004, 4, 4, 16, 51), 'DavidHeinemeierHansson', test_renderer)
|
||||
Time.local(2004, 4, 4, 16, 51), 'DavidHeinemeierHansson', x_test_renderer)
|
||||
end
|
||||
|
||||
def assert_markup_parsed_as(expected_output, input)
|
||||
revision = Revision.new(:page => @page, :content => input, :author => Author.new('AnAuthor'))
|
||||
assert_equal expected_output, test_renderer(revision).display_content(true), 'Rendering output not as expected'
|
||||
assert_equal expected_output, x_test_renderer(revision).display_content(true), 'Rendering output not as expected'
|
||||
end
|
||||
|
||||
def assert_match_markup_parsed_as(expected_output, input)
|
||||
revision = Revision.new(:page => @page, :content => input, :author => Author.new('AnAuthor'))
|
||||
assert_match expected_output, test_renderer(revision).display_content, 'Rendering output not as expected'
|
||||
assert_match expected_output, x_test_renderer(revision).display_content, 'Rendering output not as expected'
|
||||
end
|
||||
|
||||
def rendered_content(page)
|
||||
test_renderer(page.revisions.last).display_content
|
||||
x_test_renderer(page.revisions.last).display_content
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ class PageTest < ActiveSupport::TestCase
|
|||
|
||||
def test_revise
|
||||
@page.revise('HisWay would be MyWay in kinda lame', @page.name, Time.local(2004, 4, 4, 16, 52),
|
||||
'MarianneSyhler', test_renderer)
|
||||
'MarianneSyhler', x_test_renderer)
|
||||
@page.reload
|
||||
|
||||
assert_equal 2, @page.revisions.length, 'Should have two revisions'
|
||||
|
|
@ -45,14 +45,14 @@ class PageTest < ActiveSupport::TestCase
|
|||
|
||||
def test_revise_continous_revision
|
||||
@page.revise('HisWay would be MyWay in kinda lame', @page.name, Time.local(2004, 4, 4, 16, 55),
|
||||
'MarianneSyhler', test_renderer)
|
||||
'MarianneSyhler', x_test_renderer)
|
||||
@page.reload
|
||||
assert_equal 2, @page.revisions.length
|
||||
assert_equal 'HisWay would be MyWay in kinda lame', @page.content
|
||||
|
||||
# consecutive revision by the same author within 30 minutes doesn't create a new revision
|
||||
@page.revise('HisWay would be MyWay in kinda update', @page.name, Time.local(2004, 4, 4, 16, 57),
|
||||
'MarianneSyhler', test_renderer)
|
||||
'MarianneSyhler', x_test_renderer)
|
||||
@page.reload
|
||||
assert_equal 2, @page.revisions.length
|
||||
assert_equal 'HisWay would be MyWay in kinda update', @page.content
|
||||
|
|
@ -60,7 +60,7 @@ class PageTest < ActiveSupport::TestCase
|
|||
|
||||
# but consecutive revision by another author results in a new revision
|
||||
@page.revise('HisWay would be MyWay in the house', @page.name, Time.local(2004, 4, 4, 16, 58),
|
||||
'DavidHeinemeierHansson', test_renderer)
|
||||
'DavidHeinemeierHansson', x_test_renderer)
|
||||
@page.reload
|
||||
assert_equal 3, @page.revisions.length
|
||||
assert_equal 'HisWay would be MyWay in the house', @page.content
|
||||
|
|
@ -68,14 +68,14 @@ class PageTest < ActiveSupport::TestCase
|
|||
# consecutive update after 30 minutes since the last one also creates a new revision,
|
||||
# even when it is by the same author
|
||||
@page.revise('HisWay would be MyWay in my way', @page.name, Time.local(2004, 4, 4, 17, 30),
|
||||
'DavidHeinemeierHansson', test_renderer)
|
||||
'DavidHeinemeierHansson', x_test_renderer)
|
||||
@page.reload
|
||||
assert_equal 4, @page.revisions.length
|
||||
end
|
||||
|
||||
def test_change_name
|
||||
@page.revise('HisWay would be MyWay in my way', 'SecondPage', Time.local(2004, 4, 5, 17, 56),
|
||||
'MarianneSyhler', test_renderer)
|
||||
'MarianneSyhler', x_test_renderer)
|
||||
@page.reload
|
||||
|
||||
assert_equal "Second Page", @page.plain_name
|
||||
|
|
@ -91,7 +91,7 @@ class PageTest < ActiveSupport::TestCase
|
|||
revisions_number_before = @page.revisions.size
|
||||
|
||||
assert_raises(Instiki::ValidationError) {
|
||||
@page.revise(@page.current_revision.content, @page.name, Time.now, 'AlexeyVerkhovsky', test_renderer)
|
||||
@page.revise(@page.current_revision.content, @page.name, Time.now, 'AlexeyVerkhovsky', x_test_renderer)
|
||||
}
|
||||
|
||||
assert_equal last_revision_before, @page.current_revision(true)
|
||||
|
|
@ -102,7 +102,7 @@ class PageTest < ActiveSupport::TestCase
|
|||
web = Web.find(1)
|
||||
new_page = Page.new(:web => web, :name => 'NewPage')
|
||||
new_page.revise('Reference to WantedPage, and to WantedPage2', 'NewPage', Time.now, 'AlexeyVerkhovsky',
|
||||
test_renderer)
|
||||
x_test_renderer)
|
||||
|
||||
references = new_page.wiki_references(true)
|
||||
assert_equal 2, references.size
|
||||
|
|
@ -112,7 +112,7 @@ class PageTest < ActiveSupport::TestCase
|
|||
assert_equal WikiReference::WANTED_PAGE, references[1].link_type
|
||||
|
||||
wanted_page = Page.new(:web => web, :name => 'WantedPage')
|
||||
wanted_page.revise('And here it is!', 'WantedPage', Time.now, 'AlexeyVerkhovsky', test_renderer)
|
||||
wanted_page.revise('And here it is!', 'WantedPage', Time.now, 'AlexeyVerkhovsky', x_test_renderer)
|
||||
|
||||
# link type stored for NewPage -> WantedPage reference should change from WANTED to LINKED
|
||||
# reference NewPage -> WantedPage2 should remain the same
|
||||
|
|
@ -128,7 +128,7 @@ class PageTest < ActiveSupport::TestCase
|
|||
web = Web.find(1)
|
||||
new_page = Page.new(:web => web, :name => 'NewPage')
|
||||
new_page.revise('Reference to HappyPage, and to WantedPage2', 'NewPage', Time.local(2004, 4, 5, 17, 56), 'AlexeyVerkhovsky',
|
||||
test_renderer)
|
||||
x_test_renderer)
|
||||
|
||||
references = new_page.wiki_references(true)
|
||||
assert_equal 2, references.size
|
||||
|
|
@ -140,7 +140,7 @@ class PageTest < ActiveSupport::TestCase
|
|||
assert_equal ["HappyPage", "HisWay", "OverThere", "WantedPage2"], wanted_pages
|
||||
|
||||
my_page = Page.new(:web => web, :name => 'MyPage')
|
||||
my_page.revise("[[!redirects HappyPage]]\nAnd here it is!", 'MyPage', Time.now, 'AlexeyVerkhovsky', test_renderer)
|
||||
my_page.revise("[[!redirects HappyPage]]\nAnd here it is!", 'MyPage', Time.now, 'AlexeyVerkhovsky', x_test_renderer)
|
||||
my_references = my_page.wiki_references(true)
|
||||
assert_equal 1, my_references.size
|
||||
assert_equal 'HappyPage', my_references[0].referenced_name
|
||||
|
|
@ -152,7 +152,7 @@ class PageTest < ActiveSupport::TestCase
|
|||
# reference NewPage -> WantedPage2 should remain the same
|
||||
references = new_page.wiki_references #(true)
|
||||
assert_match( "Reference to <a class='existingWikiWord' href='\.\./show/MyPage'>Happy Page</a>",
|
||||
test_renderer(new_page.revisions.last).display_content(true) )
|
||||
x_test_renderer(new_page.revisions.last).display_content(true) )
|
||||
assert_equal 2, references.size
|
||||
assert_equal 'HappyPage', references[0].referenced_name
|
||||
# Doesn't work, since picking up the change in wiki_references requires a database query.
|
||||
|
|
@ -163,12 +163,12 @@ class PageTest < ActiveSupport::TestCase
|
|||
assert_equal ["HisWay", "OverThere", "WantedPage2"], wanted_pages
|
||||
|
||||
new_page.revise('Reference to HappyPage and to WantedPage2.pdf and [[foo.pdf]]', 'NewPage', Time.now, 'AlexeyVerkhovsky',
|
||||
test_renderer)
|
||||
x_test_renderer)
|
||||
references = new_page.wiki_references(true)
|
||||
assert_equal( "<p>Reference to <a class='existingWikiWord' href='\.\./show/MyPage'>Happy Page</a>" +
|
||||
" and to <span class='newWikiWord'>Wanted Page2<a href='../show/WantedPage2'>?</a></span>.pdf " +
|
||||
"and <span class='wikilink-error'><b>Illegal link (target contains a '.'):</b> foo.pdf</span></p>",
|
||||
test_renderer(new_page.revisions.last).display_content(true) )
|
||||
x_test_renderer(new_page.revisions.last).display_content(true) )
|
||||
assert_equal 3, references.size
|
||||
# now it works.
|
||||
assert_equal 'HappyPage', references[0].referenced_name
|
||||
|
|
@ -182,11 +182,11 @@ class PageTest < ActiveSupport::TestCase
|
|||
end
|
||||
|
||||
def test_rollback
|
||||
@page.revise("spot two", @page.name, Time.now, "David", test_renderer)
|
||||
@page.revise("spot three", @page.name, Time.now + 2000, "David", test_renderer)
|
||||
@page.revise("spot two", @page.name, Time.now, "David", x_test_renderer)
|
||||
@page.revise("spot three", @page.name, Time.now + 2000, "David", x_test_renderer)
|
||||
assert_equal 3, @page.revisions(true).length, "Should have three revisions"
|
||||
@page.current_revision(true)
|
||||
@page.rollback(0, Time.now, '127.0.0.1', test_renderer)
|
||||
@page.rollback(0, Time.now, '127.0.0.1', x_test_renderer)
|
||||
assert_equal "HisWay would be MyWay $\\sin(x)\\begin{svg}<svg/>\\end{svg}\\includegraphics[width=3em]{foo}$ in kinda ThatWay in HisWay though MyWay \\\\OverThere -- see SmartEngine in that SmartEngineGUI", @page.current_revision(true).content
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -61,9 +61,9 @@ class WebTest < ActiveSupport::TestCase
|
|||
def test_new_page_linked_from_mother_page
|
||||
# this was a bug in revision 204
|
||||
home = @web.add_page('HomePage', 'This page refers to AnotherPage',
|
||||
Time.local(2004, 4, 4, 16, 50), 'Alexey Verkhovsky', test_renderer)
|
||||
Time.local(2004, 4, 4, 16, 50), 'Alexey Verkhovsky', x_test_renderer)
|
||||
@web.add_page('AnotherPage', 'This is \AnotherPage',
|
||||
Time.local(2004, 4, 4, 16, 51), 'Alexey Verkhovsky', test_renderer)
|
||||
Time.local(2004, 4, 4, 16, 51), 'Alexey Verkhovsky', x_test_renderer)
|
||||
|
||||
@web.pages(true)
|
||||
assert_equal [home], @web.select.pages_that_link_to('AnotherPage')
|
||||
|
|
@ -73,13 +73,13 @@ class WebTest < ActiveSupport::TestCase
|
|||
add_sample_pages
|
||||
home = @web.add_page('HomePage',
|
||||
'This is a home page, it should not be an orphan',
|
||||
Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', test_renderer)
|
||||
Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', x_test_renderer)
|
||||
author = @web.add_page('AlexeyVerkhovsky',
|
||||
'This is an author page, it should not be an orphan',
|
||||
Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', test_renderer)
|
||||
Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', x_test_renderer)
|
||||
self_linked = @web.add_page('SelfLinked',
|
||||
"I am SelfLinked and link to EverBeenInLove\ncategory: fubar",
|
||||
Time.local(2004, 4, 4, 16, 50), 'AnonymousCoward', test_renderer)
|
||||
Time.local(2004, 4, 4, 16, 50), 'AnonymousCoward', x_test_renderer)
|
||||
|
||||
# page that links to itself, and nobody else links to it must be an orphan
|
||||
assert_equal ['EverBeenHated', 'SelfLinked'],
|
||||
|
|
@ -102,8 +102,8 @@ class WebTest < ActiveSupport::TestCase
|
|||
|
||||
def add_sample_pages
|
||||
@in_love = @web.add_page('EverBeenInLove', "Who am I me\ncategory: fubar",
|
||||
Time.local(2004, 4, 4, 16, 50), 'DavidHeinemeierHansson', test_renderer)
|
||||
Time.local(2004, 4, 4, 16, 50), 'DavidHeinemeierHansson', x_test_renderer)
|
||||
@hated = @web.add_page('EverBeenHated', 'I am me EverBeenHated',
|
||||
Time.local(2004, 4, 4, 16, 51), 'DavidHeinemeierHansson', test_renderer)
|
||||
Time.local(2004, 4, 4, 16, 51), 'DavidHeinemeierHansson', x_test_renderer)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue