From c0c4b7277b95612418d8651bcb7eba5c64c6707c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 20 Oct 2015 15:14:20 +0200
Subject: [PATCH] bump shoulda-matchers

---
 Gemfile             | 2 +-
 Gemfile.lock        | 6 +++---
 spec/spec_helper.rb | 7 +++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index e1eaa6264..9d5df3885 100644
--- a/Gemfile
+++ b/Gemfile
@@ -268,7 +268,7 @@ group :test do
   gem "factory_girl_rails", "4.5.0"
   gem "timecop",            "0.8.0"
   gem "webmock",            "1.21.0", require: false
-  gem "shoulda-matchers",   "2.8.0", require: false
+  gem "shoulda-matchers",   "3.0.0"
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 5fc82488a..c5eacda06 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -659,8 +659,8 @@ GEM
       rubyzip (~> 1.0)
       websocket (~> 1.0)
     shellany (0.0.1)
-    shoulda-matchers (2.8.0)
-      activesupport (>= 3.0.0)
+    shoulda-matchers (3.0.0)
+      activesupport (>= 4.0.0)
     sidekiq (3.4.2)
       celluloid (~> 0.16.0)
       connection_pool (~> 2.2, >= 2.2.0)
@@ -861,7 +861,7 @@ DEPENDENCIES
   rubyzip (= 1.1.7)
   sass-rails (= 5.0.4)
   selenium-webdriver (= 2.47.1)
-  shoulda-matchers (= 2.8.0)
+  shoulda-matchers (= 3.0.0)
   sidekiq (= 3.4.2)
   sidetiq (= 0.6.3)
   simple_captcha2 (= 0.3.4)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 32937f978..ca444256a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -106,3 +106,10 @@ RSpec.configure do |config|
 
   config.include FactoryGirl::Syntax::Methods
 end
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :rails
+  end
+end