Rolled back some changes to spec_helper
This commit is contained in:
parent
f0db58f912
commit
c39b69ed8c
1 changed files with 3 additions and 3 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
# This file is copied to ~/spec when you run 'ruby script/generate rspec'
|
# This file is copied to ~/spec when you run 'ruby script/generate rspec'
|
||||||
# from the project root directory.
|
# from the project root directory.
|
||||||
ENV["RAILS_ENV"] ||= 'test'
|
ENV["RAILS_ENV"] ||= 'test'
|
||||||
require File.dirname(__FILE__) + "/../config/environment" #unless defined?(Rails)
|
require File.dirname(__FILE__) + "/../config/environment" unless defined?(Rails)
|
||||||
require 'rspec/rails'
|
require 'rspec/rails'
|
||||||
require 'database_cleaner'
|
require 'database_cleaner'
|
||||||
#require File.dirname(__FILE__) + "/factories"
|
#require File.dirname(__FILE__) + "/factories"
|
||||||
|
|
@ -21,7 +21,7 @@ Rspec.configure do |config|
|
||||||
DatabaseCleaner.orm = "mongoid"
|
DatabaseCleaner.orm = "mongoid"
|
||||||
|
|
||||||
config.before(:suite) do
|
config.before(:suite) do
|
||||||
# DatabaseCleaner.strategy = :transaction
|
DatabaseCleaner.strategy = :transaction
|
||||||
DatabaseCleaner.clean_with(:truncation)
|
DatabaseCleaner.clean_with(:truncation)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -39,5 +39,5 @@ Rspec.configure do |config|
|
||||||
# If you're not using ActiveRecord, or you'd prefer not to run each of your
|
# If you're not using ActiveRecord, or you'd prefer not to run each of your
|
||||||
# examples within a transaction, comment the following line or assign false
|
# examples within a transaction, comment the following line or assign false
|
||||||
# instead of true.
|
# instead of true.
|
||||||
# config.use_transactional_fixtures = true
|
config.use_transactional_fixtures = true
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue