Bump shoulda-matchers, specify shoulda-context

Require shoulda-matchers explicitly in `spec_helper.rb`
(as recommended in README:
https://github.com/thoughtbot/shoulda-matchers/tree/v2.8.0#rspec)

Signed-off-by: Alex Coles <alex@alexbcoles.com>

Gemfile

@@ -136,7 +136,8 @@ gem 'fog', '~> 1.23.0', require: "fog/aws/storage"
 
 group :test do
   gem 'rack-test', '~> 0.6.2'
-  gem 'shoulda'
+  gem 'shoulda-context', '~> 1.2'
+
   gem 'object-daddy', '~> 1.1.0'
   gem "launchy", "~> 2.3.0"
   gem "factory_girl_rails", "~> 4.5"
@@ -162,7 +163,7 @@ group :test do
   # why in Gemfile? see: https://github.com/guard/guard-test
   gem 'ruby-prof'
   gem 'simplecov', '0.8.0.pre'
-  gem "shoulda-matchers", '~> 2.5.0'
+  gem "shoulda-matchers", '~> 2.8', require: nil
   gem "json_spec"
   gem "activerecord-tableless", "~> 1.0"
   gem "codeclimate-test-reporter", :require => nil

Gemfile.lock

@@ -261,7 +261,7 @@ GEM
     mime-types (1.25.1)
     mini_portile (0.6.2)
     minisyntax (0.2.3)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     multi_test (0.1.1)
     multi_xml (0.5.5)
     mysql2 (0.3.17)
@@ -411,11 +411,8 @@ GEM
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
     shoulda-context (1.2.1)
-    shoulda-matchers (2.5.0)
+    shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
     simplecov (0.8.0.pre)
       multi_json
@@ -544,8 +541,8 @@ DEPENDENCIES
   sass (~> 3.4.12)
   sass-rails!
   selenium-webdriver (~> 2.44.0)
-  shoulda
-  shoulda-matchers (~> 2.5.0)
+  shoulda-context (~> 1.2)
+  shoulda-matchers (~> 2.8)
   simplecov (= 0.8.0.pre)
   sprockets!
   sprockets-rails!

spec/spec_helper.rb

@@ -38,7 +38,7 @@ ENV['RAILS_ENV'] ||= 'test'
 
 require File.expand_path('../../config/environment', __FILE__)
 require 'rspec/rails'
-
+require 'shoulda/matchers'
 require 'rspec/example_disabler'
 require 'capybara/rails'