Skip to content
Browse files

Make Active Record tests pass in isolation

Also remove the feature detecting for Ruby 1.9
  • Loading branch information...
1 parent 721cf54 commit 5d82c1fc56bedb3e0b736ec06b106b2989918978 @rafaelfranca rafaelfranca committed Oct 29, 2012
View
3 activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -68,8 +68,7 @@ def connection_url_to_hash(url) # :nodoc:
:database => config.path.sub(%r{^/},""),
:host => config.host }
spec.reject!{ |_,value| !value }
- uri_parser = URI.const_defined?(:Parser) ? URI::Parser.new : URI
- spec.map { |key,value| spec[key] = uri_parser.unescape(value) if value.is_a?(String) }
+ spec.map { |key,value| spec[key] = URI.unescape(value) if value.is_a?(String) }
if config.query
options = Hash[config.query.split("&").map{ |pair| pair.split("=") }].symbolize_keys
spec.merge!(options)
View
2 activerecord/test/cases/connection_specification/resolver_test.rb
@@ -42,7 +42,7 @@ def test_url_port
def test_encoded_password
skip "only if mysql is available" unless current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
password = 'am@z1ng_p@ssw0rd#!'
- encoded_password = URI.encode_www_form_component(password)
+ encoded_password = URI.respond_to?(:encode_www_form_component) ? URI.encode_www_form_component(password) : "am%40z1ng_p%40ssw0rd%23%21"
spec = resolve "mysql://foo:#{encoded_password}@localhost/bar"
assert_equal password, spec[:password]
end

0 comments on commit 5d82c1f

Please sign in to comment.
Something went wrong with that request. Please try again.