aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/routing_test.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-12-22 13:09:43 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-12-22 13:09:54 -0700
commit2bc3f81c89c1cd7444d476411bef626173172dc0 (patch)
treedc3e06f7dfd737cd65e66806f5f519ecb66b9616 /actionpack/test/controller/routing_test.rb
parent585e291250410c5319a7dd950f81d09599a492b7 (diff)
downloadrails-2bc3f81c89c1cd7444d476411bef626173172dc0.tar.gz
rails-2bc3f81c89c1cd7444d476411bef626173172dc0.tar.bz2
rails-2bc3f81c89c1cd7444d476411bef626173172dc0.zip
rack bodies should be a list
Diffstat (limited to 'actionpack/test/controller/routing_test.rb')
-rw-r--r--actionpack/test/controller/routing_test.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index d6ae9909b8..715cc229e1 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -90,16 +90,16 @@ class LegacyRouteSetTests < Test::Unit::TestCase
'REQUEST_METHOD' => 'GET',
'HTTP_HOST' => host}
- @rs.call(params)[2]
+ @rs.call(params)[2].join
end
def test_regexp_precidence
@rs.draw do
match '/whois/:domain', :constraints => {
:domain => /\w+\.[\w\.]+/ },
- :to => lambda { |env| [200, {}, 'regexp'] }
+ :to => lambda { |env| [200, {}, %w{regexp}] }
- match '/whois/:id', :to => lambda { |env| [200, {}, 'id'] }
+ match '/whois/:id', :to => lambda { |env| [200, {}, %w{id}] }
end
assert_equal 'regexp', get(URI('http://example.org/whois/example.org'))
@@ -115,9 +115,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
@rs.draw do
match '/', :constraints => subdomain.new,
- :to => lambda { |env| [200, {}, 'default'] }
+ :to => lambda { |env| [200, {}, %w{default}] }
match '/', :constraints => { :subdomain => 'clients' },
- :to => lambda { |env| [200, {}, 'clients'] }
+ :to => lambda { |env| [200, {}, %w{clients}] }
end
assert_equal 'default', get(URI('http://www.example.org/'))
@@ -128,11 +128,11 @@ class LegacyRouteSetTests < Test::Unit::TestCase
@rs.draw do
match '/', :constraints => lambda { |req|
req.subdomain.present? and req.subdomain != "clients" },
- :to => lambda { |env| [200, {}, 'default'] }
+ :to => lambda { |env| [200, {}, %w{default}] }
match '/', :constraints => lambda { |req|
req.subdomain.present? && req.subdomain == "clients" },
- :to => lambda { |env| [200, {}, 'clients'] }
+ :to => lambda { |env| [200, {}, %w{clients}] }
end
assert_equal 'default', get(URI('http://www.example.org/'))