Started on the actual rspec 3 upgrade

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Gemfile

@@ -225,8 +225,8 @@ group :development, :test do
   gem 'coveralls', require: false
   gem 'rubocop', '0.28.0', require: false
   gem 'spinach-rails'
-  gem "rspec-rails", '2.99'
-  gem 'capybara', '~> 2.2.1'
+  gem "rspec-rails", '3.0.0'
+  gem "capybara", '~> 2.2.1'
   gem 'capybara-screenshot', '~> 1.0.0'
   gem "pry-rails"
   gem "awesome_print"

Gemfile.lock

@@ -530,21 +530,22 @@ GEM
     rqrcode (0.4.2)
     rqrcode-rails3 (0.1.7)
       rqrcode (>= 0.4.2)
-    rspec-collection_matchers (1.1.2)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.3)
-    rspec-rails (2.99.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.0)
       actionpack (>= 3.0)
-      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-collection_matchers
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
     rubocop (0.28.0)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.pre.7, < 3.0)
@@ -815,7 +816,7 @@ DEPENDENCIES
   request_store
   rerun (~> 0.10.0)
   rqrcode-rails3
-  rspec-rails (= 2.99)
+  rspec-rails (= 3.0.0)
   rubocop (= 0.28.0)
   rugments (~> 1.0.0.beta7)
   sanitize (~> 2.0)

features/support/env.rb

@@ -25,6 +25,7 @@ WebMock.allow_net_connect!
 
 Spinach.hooks.before_run do
   include RSpec::Mocks::ExampleMethods
+  RSpec::Mocks.setup
   TestEnv.init(mailer: false)
 
   include FactoryGirl::Syntax::Methods

spec/rails_helper.rb

+require "spec_helper"