Fix failing test case on master

It turned out that I overlook at some replacements ..

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

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