AutoCommit Mit Sep 9 23:03:01 CEST 2015

Gemfile

@@ -87,7 +87,7 @@ group :development, :test do
 gem 'factory_girl_rails',"~>4.5.0"
 #gem 'minitest', "~>4.7.5"
 gem 'progress_bar'
-gem 'rspec-rails', '~>3.2.0'
+gem 'rspec-rails', '~>3.3.0'
 
 gem 'rspec-collection_matchers'
 gem 'rspec-activemodel-mocks'

spec/spec_helper.rb

@@ -2,7 +2,8 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
+#require 'rspec/autorun'
+# require 'minitest/autorun'
 require 'sunspot_test/rspec' 
 require 'devise'
 # Requires supporting ruby files with custom matchers and macros, etc,