cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to rails 4.0.0

Browse source
This commit is contained in:
Tom Hughes 2013-06-26 22:41:10 +01:00
parent 40b452ac74
commit 984c6dc114
16 changed files with 229 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/functional/diary_entry_controller_test.rb
View file

@ -201,7 +201,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
assert_select "body", :count => 1 do
assert_select "div.wrapper", :count => 1 do
assert_select "div.content-heading", :count => 1 do
assert_select "h2", :text => /#{entry.user.display_name}&#x27;s diary/, :count => 1
assert_select "h2", :text => /#{entry.user.display_name}&#39;s diary/, :count => 1
end
assert_select "div#content", :count => 1 do
assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
@ -230,7 +230,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
assert_select "body", :count => 1 do
assert_select "div.wrapper", :count => 1 do
assert_select "div.content-heading", :count => 1 do
assert_select "h2", :text => /#{users(:normal_user).display_name}&#x27;s diary/, :count => 1
assert_select "h2", :text => /#{users(:normal_user).display_name}&#39;s diary/, :count => 1
end
assert_select "div#content", :count => 1 do
assert_select "div.post_heading", :text => /#{new_title}/, :count => 1

2
test/functional/site_controller_test.rb
View file

@ -59,7 +59,7 @@ class SiteControllerTest < ActionController::TestCase
{ :controller => "site", :action => "permalink", :code => "shortcode" }
)
assert_routing(
{ :path => "/preview/formatname", :method => :get },
{ :path => "/preview/formatname", :method => :post },
{ :controller => "site", :action => "preview", :format => "formatname" }
)
assert_routing(