Supporting new active_support setup for Rails 3
This commit is contained in:
parent
5dfd18cd71
commit
2139119845
|
@ -5,7 +5,7 @@ gem 'couchrest'
|
|||
|
||||
require 'couchrest'
|
||||
|
||||
require 'activesupport'
|
||||
require 'active_support/core_ext'
|
||||
require 'mime/types'
|
||||
require "enumerator"
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ require File.expand_path('../../spec_helper', __FILE__)
|
|||
|
||||
begin
|
||||
require 'rubygems' unless ENV['SKIP_RUBYGEMS']
|
||||
require 'activesupport'
|
||||
require 'active_support/json'
|
||||
ActiveSupport::JSON.backend = :JSONGem
|
||||
|
||||
class PlainParent
|
||||
|
@ -36,5 +36,5 @@ begin
|
|||
end
|
||||
|
||||
rescue LoadError
|
||||
puts "This spec requires 'active_support' to be loaded"
|
||||
puts "This spec requires 'active_support/json' to be loaded"
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue