aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrem Sichanugrist <s@sikachu.com>2011-04-11 12:35:20 +0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-04-10 22:40:21 -0700
commitd6edaeeaf8b6c0f0b741c0827ab6e091bdd4e197 (patch)
tree847ef31b04ab6fc967fd4256d2eb71c9d66e1126
parent743b6631dfc5b91b711f09eb13099cdf9dd89c1b (diff)
downloadrails-d6edaeeaf8b6c0f0b741c0827ab6e091bdd4e197.tar.gz
rails-d6edaeeaf8b6c0f0b741c0827ab6e091bdd4e197.tar.bz2
rails-d6edaeeaf8b6c0f0b741c0827ab6e091bdd4e197.zip
Fix failing test case on master
It turned out that I overlook at some replacements ..
-rw-r--r--actionpack/test/dispatch/routing_test.rb2
-rw-r--r--activesupport/bin/generate_tables2
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