AutoCommit Sam Sep 12 11:03:02 CEST 2015

spec/spec_helper.rb

@@ -1,9 +1,13 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
+require 'rbconfig'
+
 require File.expand_path("../../config/environment", __FILE__)
+#require 'rspec/autorun'
 require 'rspec/rails'
-require 'rspec/autorun'
-# require 'minitest/autorun'
+
+
+#require 'minitest/autorun'
 require 'sunspot_test/rspec' 
 require 'devise'
 # Requires supporting ruby files with custom matchers and macros, etc,
@@ -15,6 +19,8 @@ Dir[Rails.root.join("spec/controllers/shared_examples/**/*.rb")].each {|f| requi
 RSpec.configure do |config|
   config.include Devise::TestHelpers, :type => :controller
   config.extend ControllerMacros, :type => :controller
+  config.extend ModelMacros, :type => :model
+
   config.include Devise::TestHelpers, :type => :view
   config.include RSpecHtmlMatchers, :type => :view
  config.extend ViewMacros, :type => :view