aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/routing_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-04 18:42:20 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-04 18:42:20 -0300
commit95ab4fd6b7cfd1f65c68e773377cc79e777f50fc (patch)
treea59e88de788666cebdff445e6b4a30199f2ee88f /actionpack/test/dispatch/routing_test.rb
parentd65ab433ae095d99b51786c5c69be8f6cdd5e249 (diff)
parent9fd0c605b9bcfb2c2e854f3120bd3625eaa017f5 (diff)
downloadrails-95ab4fd6b7cfd1f65c68e773377cc79e777f50fc.tar.gz
rails-95ab4fd6b7cfd1f65c68e773377cc79e777f50fc.tar.bz2
rails-95ab4fd6b7cfd1f65c68e773377cc79e777f50fc.zip
Merge pull request #11166 from xavier/callable_constraint_verification
Callable route constraint verification Conflicts: actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/test/dispatch/routing_test.rb')
-rw-r--r--actionpack/test/dispatch/routing_test.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index b22a56bb27..52fc7b3243 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -4111,6 +4111,21 @@ class TestFormatConstraints < ActionDispatch::IntegrationTest
end
end
+class TestCallableConstraintValidation < ActionDispatch::IntegrationTest
+
+ def test_constraint_with_object_not_callable
+ assert_raise(ArgumentError) do
+ ActionDispatch::Routing::RouteSet.new.tap do |app|
+ app.draw do
+ ok = lambda { |env| [200, { 'Content-Type' => 'text/plain' }, []] }
+ get '/test', to: ok, constraints: Object.new
+ end
+ end
+ end
+ end
+
+end
+
class TestRouteDefaults < ActionDispatch::IntegrationTest
stub_controllers do |routes|
Routes = routes