test/test_helper.rb in miloops-attachment_fu-3.2.6 vs test/test_helper.rb in miloops-attachment_fu-3.2.7

@@ -1,21 +1,21 @@
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 ENV['RAILS_ENV'] = 'test'
-ENV['RAILS_ROOT'] ||= File.dirname(__FILE__) + '/../../../..'
+ENV['Rails.root'] ||= File.dirname(__FILE__) + '/../../../..'
 
 require 'test/unit'
-require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config/environment.rb'))
+require File.expand_path(File.join(ENV['Rails.root'], 'config/environment.rb'))
 
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 
 db_adapter = ENV['DB']
 
 # no db passed, try one of these fine config-free DBs before bombing.
-db_adapter ||= 
+db_adapter ||=
   begin
     require 'rubygems'
     require 'sqlite'
     'sqlite'
   rescue MissingSourceFile
@@ -50,22 +50,22 @@
   def setup
     Attachment.saves = 0
     DbFile.transaction { [Attachment, FileAttachment, OrphanAttachment, MinimalAttachment, DbFile].each { |klass| klass.delete_all } }
     attachment_model self.class.attachment_model
   end
-  
+
   def teardown
     FileUtils.rm_rf File.join(File.dirname(__FILE__), 'files')
     # Files generated by random_tempfile_filename
     FileUtils.rm_rf Dir['[0-9]*.{png,jpg}']
   end
 
   #self.use_transactional_fixtures = true
   #self.use_instantiated_fixtures  = false
 
   def self.attachment_model(klass = nil)
-    @attachment_model = klass if klass 
+    @attachment_model = klass if klass
     @attachment_model
   end
 
   def self.test_against_class(test_method, klass, subclass = false)
     define_method("#{test_method}_on_#{:sub if subclass}class") do
@@ -95,11 +95,11 @@
         att = attachment_model.create :uploaded_data => {"size" => file.size, "content_type" => options[:content_type] || 'image/png', "filename" => file, 'tempfile' => fixture_file_upload(file, options[:content_type] || 'image/png')}
         att.reload unless att.new_record?
         return att
       end
     end
-    
+
     def use_temp_file(fixture_filename)
       temp_path = File.join('/tmp', File.basename(fixture_filename))
       temp_dir = File.join(FIXTURE_PATH, 'tmp')
       use_file = File.join(FIXTURE_PATH, temp_path)
       FileUtils.mkdir_p temp_dir
@@ -119,14 +119,14 @@
           yield
         end
       end
     end
 
-    def assert_valid(record) 
+    def assert_valid(record)
       assert record.valid?, record.errors.full_messages.join("\n")
-    end 
-    
+    end
+
     def assert_file_jpeg_quality(model, thumbnail, expected)
       filename = if model.respond_to?(:full_filename)
         model.full_filename(thumbnail)
       else
         thumb = thumbnail ? model.thumbnails.find(:first, :conditions => { :thumbnail => thumbnail.to_s }, :include => :db_file) : model
@@ -143,38 +143,38 @@
         assert_equal expected, quality.to_i, "Produced JPEG quality (thumbnail: #{thumbnail.inspect}) is incorrect."
       else
         STDERR.puts "ImageMagick's identify not found / not in PATH: can't quickly check produced image quality."
       end
     end
-    
+
     def assert_not_created
       assert_created(0) { yield }
     end
-    
+
     def should_reject_by_size_with(klass)
       attachment_model klass
       assert_not_created do
         attachment = upload_file :filename => '/files/rails.png'
         assert attachment.new_record?
         assert attachment.errors.on(:size)
         assert_nil attachment.db_file if attachment.respond_to?(:db_file)
       end
     end
-    
+
     def assert_difference(object, method = nil, difference = 1)
       initial_value = object.send(method)
       yield
       assert_equal initial_value + difference, object.send(method)
     end
-    
+
     def assert_no_difference(object, method, &block)
       assert_difference object, method, 0, &block
     end
-    
+
     def attachment_model(klass = nil)
-      @attachment_model = klass if klass 
+      @attachment_model = klass if klass
       @attachment_model
     end
 end
 
 require File.join(File.dirname(__FILE__), 'fixtures/attachment')
-require File.join(File.dirname(__FILE__), 'base_attachment_tests')
\ No newline at end of file
+require File.join(File.dirname(__FILE__), 'base_attachment_tests')