diff options
| -rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 2 | ||||
| -rw-r--r-- | activesupport/bin/generate_tables | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index 51355b3ac7..8d23d63ebb 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -496,7 +496,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest resources :todos, :id => /\d+/ end - scope '/countries/:country', :constraints => lambda { |params, req| params[:country].either?("all", "france") } do + scope '/countries/:country', :constraints => lambda { |params, req| params[:country].either?("all", "France") } do match '/', :to => 'countries#index' match '/cities', :to => 'countries#cities' end diff --git a/activesupport/bin/generate_tables b/activesupport/bin/generate_tables index 0ca2f52363..5fefa429df 100644 --- a/activesupport/bin/generate_tables +++ b/activesupport/bin/generate_tables @@ -105,7 +105,7 @@ module ActiveSupport def normalize_boundary_map @ucd.boundary.each do |k,v| - if k.in(:lf, :cr) + if [:lf, :cr].include? k @ucd.boundary[k] = v[0] end end |