spec/spec_helper.rb in addresses-0.0.9 vs spec/spec_helper.rb in addresses-1.0.0

@@ -1,20 +1,29 @@
 ENV['RAILS_ENV'] ||= 'test'
 
+if ENV['RAILS_ENV'] == 'test'
+  require 'simplecov'
+  SimpleCov.start 'rails'
+  puts "required simplecov"
+end
+
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+
 require 'rspec/rails'
-require 'rspec/autorun'
 require 'factory_girl_rails'
+require 'shoulda/matchers'
 
 Rails.backtrace_cleaner.remove_silencers!
+# Load support files
 
-FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
-FactoryGirl.find_definitions
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f; }
 
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 RSpec.configure do |config|
   config.mock_with :rspec
   config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = false
+  config.include FactoryGirl::Syntax::Methods
   config.order = "random"
-end
\ No newline at end of file
+
+  config.include(Shoulda::Matchers::ActiveModel, type: :model)
+  config.include(Shoulda::Matchers::ActiveRecord, type: :model)
+end