From 01c6fedaeeaa4a47008f5f30ea3178324f3457b8 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Wed, 9 Sep 2015 23:03:01 +0200
Subject: [PATCH] AutoCommit Mit Sep  9 23:03:01 CEST 2015

---
 Gemfile             | 2 +-
 spec/spec_helper.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index b1931b2..702aa3c 100755
--- a/Gemfile
+++ b/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'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 088c0ab..f2cc48a 100644
--- a/spec/spec_helper.rb
+++ b/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,