Merge branch 'rs-pre-rspec-3' into 'master'

Changes back-ported from rspec3 branch

This is just breaking up the large `road-to-rspec-3` branch a bit. Each of these commits have been cherry-picked and would be good to have in place before the upgrade.

See merge request !792

1 files changed, 3 insertions, 3 deletions

diff --git a/Gemfile b/Gemfile
index 37871859517..645e0b5cf7c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -254,10 +254,10 @@ group :development, :test do
 end
 
 group :test do
-  gem "simplecov", require: false
-  gem "shoulda-matchers", "~> 2.7.0"
+  gem 'simplecov', require: false
+  gem 'shoulda-matchers', '~> 2.8.0', require: false
   gem 'email_spec'
-  gem "webmock"
+  gem 'webmock', '~> 1.21.0'
   gem 'test_after_commit'
 end