Skip to content

Commit

Permalink
Ruby 1.9.3 Compatibility
Browse files Browse the repository at this point in the history
Reported by pbernery and potat.
  • Loading branch information
distler committed May 21, 2012
1 parent b730d4e commit d4f29ac
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 2 additions & 0 deletions app/helpers/admin_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module AdminHelper
end
2 changes: 2 additions & 0 deletions app/helpers/file_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module FileHelper
end
2 changes: 1 addition & 1 deletion test/functional/wiki_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ def test_atom_with_headlines

assert_response(:success)
pages = r.template_objects['pages_by_revision']
assert_equal [@elephant, @liquor, @title_with_spaces, @oak, pages(:no_wiki_word), pages(:that_way), pages(:smart_engine), pages(:my_way), pages(:first_page), @home], pages, "Pages are not as expected: #{pages.map {|p| p.name}.inspect}"
assert_equal [@elephant, @liquor, @title_with_spaces, @oak, pages(:no_wiki_word), pages(:that_way), pages(:smart_engine), pages(:my_way), pages(:first_page), @home].sort{|x,y| x.name <=> y.name}, pages.sort{|x,y| x.name <=> y.name}, "Pages are not as expected: #{pages.map {|p| p.name}.inspect}"
assert r.template_objects['hide_description']

xml = REXML::Document.new(r.body)
Expand Down
10 changes: 3 additions & 7 deletions test/unit/page_renderer_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -448,13 +448,9 @@ def test_textile_pre

def test_rdoc
set_web_property :markup, :rdoc

@revision = Revision.new(:page => @page, :content => '+hello+ that SmartEngineGUI',
:author => Author.new('DavidHeinemeierHansson'))

assert_equal "<tt>hello</tt> that <span class='newWikiWord'>Smart Engine GUI" +
"<a href='../show/SmartEngineGUI'>?</a></span>",
x_test_renderer(@revision).display_content
re=Regexp.new("(<code>hello</code>|<tt>hello</tt>) that <span class='newWikiWord'>" +
"Smart Engine GUI<a href='\.\./show/SmartEngineGUI'>\\?</a></span>")
assert_match_markup_parsed_as(re, '+hello+ that SmartEngineGUI')
end

# def test_content_with_auto_links
Expand Down
Empty file.

0 comments on commit d4f29ac

Please sign in to comment.