Permalink
Browse files

Fix failing test case on master

It turned out that I overlook at some replacements ..
  • Loading branch information...
sikachu authored and tenderlove committed Apr 11, 2011
1 parent 743b663 commit d6edaeeaf8b6c0f0b741c0827ab6e091bdd4e197
Showing with 2 additions and 2 deletions.
  1. +1 −1 actionpack/test/dispatch/routing_test.rb
  2. +1 −1 activesupport/bin/generate_tables
@@ -496,7 +496,7 @@ def self.call(params, request)
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
@@ -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

0 comments on commit d6edaee

Please sign in to comment.