Upgrade rspec

thoughtbot · Oct 8, 2015 · 07fe5eb · 07fe5eb
1 parent 125ba3e
commit 07fe5eb
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 20 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,8 +5,7 @@ gem 'bundler', '~> 1.1'
 gem 'pry', github: 'pry/pry'
 gem 'pry-byebug'
 gem 'rake', '~> 10.0'
-gem 'rspec-core', '>= 3.2.0', '< 4'
-gem 'rspec-expectations', '>= 3.2.0', '< 4'
+gem 'rspec', '~> 3.2'
 
 # YARD
 gem 'yard'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -30,11 +30,18 @@ GEM
       yajl-ruby (~> 1.1.0)
     rake (10.4.2)
     redcarpet (3.0.0)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
     rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
     rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
     slop (3.6.0)
     thor (0.19.1)
@@ -53,8 +60,7 @@ DEPENDENCIES
   pygments.rb
   rake (~> 10.0)
   redcarpet
-  rspec-core (>= 3.2.0, < 4)
-  rspec-expectations (>= 3.2.0, < 4)
+  rspec (~> 3.2)
   yard
 
 BUNDLED WITH

diff --git a/gemfiles/4.0.0.gemfile b/gemfiles/4.0.0.gemfile
@@ -7,8 +7,7 @@ gem "bundler", "~> 1.1"
 gem "pry", :github => "pry/pry"
 gem "pry-byebug"
 gem "rake", "~> 10.0"
-gem "rspec-core", ">= 3.2.0", "< 4"
-gem "rspec-expectations", ">= 3.2.0", "< 4"
+gem "rspec", "~> 3.2"
 gem "yard"
 gem "redcarpet"
 gem "pygments.rb"

diff --git a/gemfiles/4.0.0.gemfile.lock b/gemfiles/4.0.0.gemfile.lock
@@ -118,6 +118,10 @@ GEM
     rake (10.4.2)
     rdoc (4.2.0)
     redcarpet (3.3.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
     rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
     rspec-expectations (3.3.1)
@@ -199,8 +203,7 @@ DEPENDENCIES
   rails (= 4.0.0)
   rake (~> 10.0)
   redcarpet
-  rspec-core (>= 3.2.0, < 4)
-  rspec-expectations (>= 3.2.0, < 4)
+  rspec (~> 3.2)
   rspec-rails (>= 3.2.0, < 4)
   sass-rails (~> 4.0.0)
   sdoc

diff --git a/gemfiles/4.0.1.gemfile b/gemfiles/4.0.1.gemfile
@@ -7,8 +7,7 @@ gem "bundler", "~> 1.1"
 gem "pry", :github => "pry/pry"
 gem "pry-byebug"
 gem "rake", "~> 10.0"
-gem "rspec-core", ">= 3.2.0", "< 4"
-gem "rspec-expectations", ">= 3.2.0", "< 4"
+gem "rspec", "~> 3.2"
 gem "yard"
 gem "redcarpet"
 gem "pygments.rb"

diff --git a/gemfiles/4.0.1.gemfile.lock b/gemfiles/4.0.1.gemfile.lock
@@ -120,6 +120,10 @@ GEM
     rake (10.4.2)
     rdoc (4.2.0)
     redcarpet (3.3.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
     rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
     rspec-expectations (3.3.1)
@@ -201,8 +205,7 @@ DEPENDENCIES
   rails (= 4.0.1)
   rake (~> 10.0)
   redcarpet
-  rspec-core (>= 3.2.0, < 4)
-  rspec-expectations (>= 3.2.0, < 4)
+  rspec (~> 3.2)
   rspec-rails (>= 3.2.0, < 4)
   sass-rails (~> 4.0.0)
   sdoc

diff --git a/gemfiles/4.1.gemfile b/gemfiles/4.1.gemfile
@@ -7,8 +7,7 @@ gem "bundler", "~> 1.1"
 gem "pry", :github => "pry/pry"
 gem "pry-byebug"
 gem "rake", "~> 10.0"
-gem "rspec-core", ">= 3.2.0", "< 4"
-gem "rspec-expectations", ">= 3.2.0", "< 4"
+gem "rspec", "~> 3.2"
 gem "yard"
 gem "redcarpet"
 gem "pygments.rb"

diff --git a/gemfiles/4.1.gemfile.lock b/gemfiles/4.1.gemfile.lock
@@ -116,6 +116,10 @@ GEM
     rake (10.4.2)
     rdoc (4.2.0)
     redcarpet (3.3.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
     rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
     rspec-expectations (3.3.1)
@@ -196,8 +200,7 @@ DEPENDENCIES
   rails (~> 4.1.0)
   rake (~> 10.0)
   redcarpet
-  rspec-core (>= 3.2.0, < 4)
-  rspec-expectations (>= 3.2.0, < 4)
+  rspec (~> 3.2)
   rspec-rails (>= 3.2.0, < 4)
   sass-rails (~> 4.0.3)
   sdoc (~> 0.4.0)

diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile
@@ -7,8 +7,7 @@ gem "bundler", "~> 1.1"
 gem "pry", :github => "pry/pry"
 gem "pry-byebug"
 gem "rake", "~> 10.0"
-gem "rspec-core", ">= 3.2.0", "< 4"
-gem "rspec-expectations", ">= 3.2.0", "< 4"
+gem "rspec", "~> 3.2"
 gem "yard"
 gem "redcarpet"
 gem "pygments.rb"

diff --git a/gemfiles/4.2.gemfile.lock b/gemfiles/4.2.gemfile.lock
@@ -141,6 +141,10 @@ GEM
     rake (10.4.2)
     rdoc (4.2.0)
     redcarpet (3.3.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
     rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
     rspec-expectations (3.3.1)
@@ -219,8 +223,7 @@ DEPENDENCIES
   rails (~> 4.2.0)
   rake (~> 10.0)
   redcarpet
-  rspec-core (>= 3.2.0, < 4)
-  rspec-expectations (>= 3.2.0, < 4)
+  rspec (~> 3.2)
   rspec-rails (>= 3.2.0, < 4)
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)