spec/spec_helper.rb in enju_leaf-1.1.0.rc10 vs spec/spec_helper.rb in enju_leaf-1.1.0.rc11
- old
+ new
@@ -6,10 +6,11 @@
require File.expand_path("../dummy/config/environment", __FILE__)
require 'rspec/rails'
require 'vcr'
require 'factory_girl'
require 'sunspot-rails-tester'
+require 'rspec/active_model/mocks'
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
@@ -41,9 +42,11 @@
config.before :each, :solr => true do
Sunspot::Rails::Tester.start_original_sunspot_session
Sunspot.session = $original_sunspot_session
Sunspot.remove_all!
end
+
+ config.infer_spec_type_from_file_location!
end
FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"
FactoryGirl.find_definitions