test/helper.rb in paperclip-2.3.5 vs test/helper.rb in paperclip-2.3.6

- old
+ new

@@ -3,22 +3,10 @@ require 'test/unit' require 'shoulda' require 'mocha' -case ENV['RAILS_VERSION'] -when '2.1' then - gem 'activerecord', '~>2.1.0' - gem 'activesupport', '~>2.1.0' -when '3.0' then - gem 'activerecord', '~>3.0.0' - gem 'activesupport', '~>3.0.0' -else - gem 'activerecord', '~>2.3.0' - gem 'activesupport', '~>2.3.0' -end - require 'active_record' require 'active_record/version' require 'active_support' puts "Testing against version #{ActiveRecord::VERSION::STRING}" @@ -51,10 +39,10 @@ $LOAD_PATH << File.join(ROOT, 'lib') $LOAD_PATH << File.join(ROOT, 'lib', 'paperclip') require File.join(ROOT, 'lib', 'paperclip.rb') -require 'shoulda_macros/paperclip' +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::BufferedLogger.new(File.dirname(__FILE__) + "/debug.log") ActiveRecord::Base.establish_connection(config['test'])