From f84541b1ba21f5c12e40fd8be661076fd364aa48 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Sat, 25 Apr 2015 18:29:43 -0400
Subject: [PATCH] Update rspec to rspec 3.2.0

---
 Gemfile      |  3 +--
 Gemfile.lock | 42 ++++++++++++++++++++++--------------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/Gemfile b/Gemfile
index 50a64cb1392..74ddca1d9fe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -186,8 +186,7 @@ group :test do
 end
 
 group :test, :development do
-  # while upgrading to 3
-  gem 'rspec', '2.99.0'
+  gem 'rspec', '~> 3.2.0'
   gem 'mock_redis'
   gem 'listen', '0.7.3', require: false
   gem 'certified', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 865cf4252e6..aaefc61f609 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -343,28 +343,30 @@ GEM
       netrc (~> 0.7)
     rinku (1.7.3)
     rmmseg-cpp (0.2.9)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-collection_matchers (1.0.0)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
     rspec-given (3.5.4)
       given_core (= 3.5.4)
       rspec (>= 2.12)
-    rspec-mocks (2.99.2)
-    rspec-rails (2.99.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-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.1)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
     rtlit (0.0.5)
     ruby-openid (2.5.0)
     ruby-readability (0.7.0)
@@ -525,7 +527,7 @@ DEPENDENCIES
   rest-client
   rinku
   rmmseg-cpp
-  rspec (= 2.99.0)
+  rspec (~> 3.2.0)
   rspec-given
   rspec-rails
   rtlit