spec/spec_helper.rb in rails-uploader-0.0.3 vs spec/spec_helper.rb in rails-uploader-0.0.4

@@ -4,24 +4,31 @@
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require "rspec/rails"
 require "database_cleaner"
 
+# Fixtures replacement with a straightforward definition syntax
+require 'factory_girl'
+FactoryGirl.definition_file_paths = [ File.expand_path("../factories/", __FILE__) ]
+FactoryGirl.find_definitions
+
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
 ActionMailer::Base.default_url_options[:host] = "test.com"
 
 Rails.backtrace_cleaner.remove_silencers!
 
 # Run any available migration
 ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
 
+require 'carrierwave'
+CarrierWave.configure do |config|
+  config.storage = :file
+  config.enable_processing = true
+end
+
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-#require 'factory_girl'
-#FactoryGirl.definition_file_paths = [ File.join( File.dirname(__FILE__), "factories" ) ]
-#FactoryGirl.find_definitions
 
 RSpec.configure do |config|
   # Remove this line if you don't want RSpec's should and should_not
   # methods or matchers
   require 'rspec/expectations'