2 files changed, 28 insertions, 1 deletions
diff --git a/actionpack/test/controller/parameters/parameters_permit_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb
index 33a91d72d9..1856ecd42b 100644
--- a/actionpack/test/controller/parameters/parameters_permit_test.rb
+++ b/actionpack/test/controller/parameters/parameters_permit_test.rb
@@ -169,7 +169,7 @@ class ParametersPermitTest < ActiveSupport::TestCase
 
   test 'arrays are converted at most once' do
     params = ActionController::Parameters.new(foo: [{}])
-    assert params[:foo].equal?(params[:foo])
+    assert_same params[:foo], params[:foo]
   end
 
   test "fetch doesnt raise ParameterMissing exception if there is a default" do
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 9dc6d77012..660589a86e 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -243,6 +243,33 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
     assert_equal 'clients', get(URI('http://clients.example.org/'))
   end
 
+  def test_scoped_lambda
+    scope_called = false
+    rs.draw do
+      scope '/foo', :constraints => lambda { |req| scope_called = true } do
+        get '/', :to => lambda { |env| [200, {}, %w{default}] }
+      end
+    end
+
+    assert_equal 'default', get(URI('http://www.example.org/foo/'))
+    assert scope_called, "scope constraint should be called"
+  end
+
+  def test_scoped_lambda_with_get_lambda
+    scope_called = false
+    inner_called = false
+
+    rs.draw do
+      scope '/foo', :constraints => lambda { |req| flunk "should not be called" } do
+        get '/', :constraints    => lambda { |req| inner_called = true },
+                 :to             => lambda { |env| [200, {}, %w{default}] }
+      end
+    end
+
+    assert_equal 'default', get(URI('http://www.example.org/foo/'))
+    assert inner_called, "inner constraint should be called"
+  end
+
   def test_empty_string_match
     rs.draw do
       get '/:username', :constraints => { :username => /[^\/]+/ },