aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-11 16:02:59 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-11 16:02:59 -0300
commite7580db1f34eeaf853ac7efa993eeb0902b692b4 (patch)
tree37171ffec253b6561d6f8f08b086a1ed602ba206 /actionpack
parent85ba47e3f16b3cbc3adbfc673727db709cc1ba63 (diff)
parentfca73eeb87c0d5f48f66e0a7aeba7efee7f849b8 (diff)
downloadrails-e7580db1f34eeaf853ac7efa993eeb0902b692b4.tar.gz
rails-e7580db1f34eeaf853ac7efa993eeb0902b692b4.tar.bz2
rails-e7580db1f34eeaf853ac7efa993eeb0902b692b4.zip
Merge pull request #15648 from kuldeepaggarwal/fix-warnings
remove warnings
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/routing_test.rb1
-rw-r--r--actionpack/test/journey/router_test.rb2
2 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 660589a86e..721dad4dd9 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -256,7 +256,6 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
end
def test_scoped_lambda_with_get_lambda
- scope_called = false
inner_called = false
rs.draw do
diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb
index e092432b01..2e7e8e1bea 100644
--- a/actionpack/test/journey/router_test.rb
+++ b/actionpack/test/journey/router_test.rb
@@ -213,8 +213,6 @@ module ActionDispatch
route_set = Routing::RouteSet.new
mapper = Routing::Mapper.new route_set
- strexp = Router::Strexp.build("/", {}, ['/', '.', '?'], false)
- path = Path::Pattern.new strexp
app = lambda { |env| [200, {}, ['success!']] }
mapper.get '/weblog', :to => app