Commit f8cf74b9 by Jon Yurek

Return to full green with Rails 3

parent b62cc2d2
......@@ -52,5 +52,4 @@ Gem::Specification.new do |s|
s.add_development_dependency('fakeweb')
s.add_development_dependency('railties')
s.add_development_dependency('actionmailer', '>= 3.0.0')
s.add_development_dependency('protected_attributes')
end
......@@ -14,7 +14,6 @@ require 'mime/types'
require 'pathname'
require 'ostruct'
require 'pry'
require 'protected_attributes'
puts "Testing against version #{ActiveRecord::VERSION::STRING}"
......@@ -48,7 +47,7 @@ require './shoulda_macros/paperclip'
FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
ActiveRecord::Base.logger = ActiveSupport::Logger.new(File.dirname(__FILE__) + "/debug.log")
ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
ActiveRecord::Base.establish_connection(config['test'])
Paperclip.options[:logger] = ActiveRecord::Base.logger
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment