aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/integration_test.rb
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2011-06-01 12:47:19 -0700
committerPiotr Sarnacki <drogus@gmail.com>2011-06-01 12:47:19 -0700
commit04593742c4bcb4d7dd107b6fd1234a4f42c23a10 (patch)
tree9a9f099dc56d1022adc511daebc2418004323ad1 /actionpack/test/controller/integration_test.rb
parent63665f6c9fbc19ca9163dc3811ffbe41311ca7e0 (diff)
parent8a0ffa7c9521c6c8d4298422ae1504d9d839987e (diff)
downloadrails-04593742c4bcb4d7dd107b6fd1234a4f42c23a10.tar.gz
rails-04593742c4bcb4d7dd107b6fd1234a4f42c23a10.tar.bz2
rails-04593742c4bcb4d7dd107b6fd1234a4f42c23a10.zip
Merge pull request #1447 from dmathieu/empty_route
Fix creating an empty route on 1.8. Closes #1210
Diffstat (limited to 'actionpack/test/controller/integration_test.rb')
-rw-r--r--actionpack/test/controller/integration_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 01dc2f2091..23709e44e2 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -492,6 +492,8 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
end
routes.draw do
+ match '', :to => 'application_integration_test/test#index', :as => :empty_string
+
match 'foo', :to => 'application_integration_test/test#index', :as => :foo
match 'bar', :to => 'application_integration_test/test#index', :as => :bar
end
@@ -501,11 +503,15 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
end
test "includes route helpers" do
+ assert_equal '/', empty_string_path
assert_equal '/foo', foo_path
assert_equal '/bar', bar_path
end
test "route helpers after controller access" do
+ get '/'
+ assert_equal '/', empty_string_path
+
get '/foo'
assert_equal '/foo', foo_path