From 3b0c872fca914925a8b7d13bd7bd6c1a98390244 Mon Sep 17 00:00:00 2001 From: Elliot Winkler Date: Mon, 24 Jul 2017 21:15:24 -0500 Subject: [PATCH] Update rspec & rspec-rails to 3.6.x This upgrade is mainly so we can use --only-failures which was introduced way back in RSpec 3.3. --- Appraisals | 4 +-- Gemfile | 4 +-- Gemfile.lock | 28 ++++++++++----------- gemfiles/4.2.gemfile | 8 +++--- gemfiles/4.2.gemfile.lock | 52 +++++++++++++++++++-------------------- gemfiles/5.0.gemfile | 6 ++--- gemfiles/5.0.gemfile.lock | 44 ++++++++++++++++----------------- spec/spec_helper.rb | 5 ++-- 8 files changed, 75 insertions(+), 76 deletions(-) diff --git a/Appraisals b/Appraisals index c9937bc5..1ce2ec81 100644 --- a/Appraisals +++ b/Appraisals @@ -1,5 +1,5 @@ shared_dependencies = proc do - gem 'rspec-rails', '>= 3.2.0', '< 4' + gem 'rspec-rails', '~> 3.6' gem 'shoulda-context', '~> 1.2.0' gem 'sqlite3', platform: :ruby gem 'pg', platform: :ruby @@ -20,7 +20,7 @@ appraise '4.2' do instance_eval(&spring) gem 'uglifier', '>= 1.3.0' gem 'jquery-rails' - gem 'turbolinks' + gem 'turbolinks', '2.5.3' gem 'sdoc' gem 'json', '~> 1.4' gem 'activeresource', '4.0.0' diff --git a/Gemfile b/Gemfile index 8b563ee1..d3b4e463 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,11 @@ source 'https://rubygems.org' -gem 'appraisal', '~> 2.0' +gem 'appraisal', '2.1.0' gem 'bundler', '~> 1.1' gem 'pry' gem 'pry-byebug' gem 'rake', '>= 10.5.0', '< 11' -gem 'rspec', '~> 3.2' +gem 'rspec', '~> 3.6' gem 'zeus' # YARD diff --git a/Gemfile.lock b/Gemfile.lock index 1bc13abd..c797456c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,7 @@ GEM thor (>= 0.14.0) byebug (9.0.6) coderay (1.1.1) - diff-lcs (1.2.5) + diff-lcs (1.3) fssm (0.2.10) method_source (0.8.2) multi_json (1.12.1) @@ -22,19 +22,19 @@ GEM multi_json (>= 1.0.0) rake (10.5.0) redcarpet (3.4.0) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec (3.6.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) slop (3.6.0) thor (0.19.4) yard (0.9.6) @@ -45,7 +45,7 @@ PLATFORMS ruby DEPENDENCIES - appraisal (~> 2.0) + appraisal (= 2.1.0) bundler (~> 1.1) fssm pry @@ -53,7 +53,7 @@ DEPENDENCIES pygments.rb rake (>= 10.5.0, < 11) redcarpet - rspec (~> 3.2) + rspec (~> 3.6) yard zeus diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile index 1b7723a1..ce287e9f 100644 --- a/gemfiles/4.2.gemfile +++ b/gemfiles/4.2.gemfile @@ -2,18 +2,18 @@ source "https://rubygems.org" -gem "appraisal", "~> 2.0" +gem "appraisal", "2.1.0" gem "bundler", "~> 1.1" gem "pry" gem "pry-byebug" gem "rake", ">= 10.5.0", "< 11" -gem "rspec", "~> 3.2" +gem "rspec", "~> 3.6" gem "zeus" gem "yard" gem "redcarpet" gem "pygments.rb" gem "fssm" -gem "rspec-rails", ">= 3.2.0", "< 4" +gem "rspec-rails", "~> 3.6" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "pg", :platform => :ruby @@ -26,7 +26,7 @@ gem "spring" gem "spring-commands-rspec" gem "uglifier", ">= 1.3.0" gem "jquery-rails" -gem "turbolinks" +gem "turbolinks", "2.5.3" gem "sdoc" gem "json", "~> 1.4" gem "activeresource", "4.0.0" diff --git a/gemfiles/4.2.gemfile.lock b/gemfiles/4.2.gemfile.lock index 6a7f7b4d..0f460da2 100644 --- a/gemfiles/4.2.gemfile.lock +++ b/gemfiles/4.2.gemfile.lock @@ -57,13 +57,13 @@ GEM execjs coffee-script-source (1.9.1.1) concurrent-ruby (1.0.5) - diff-lcs (1.2.5) + diff-lcs (1.3) erubis (2.7.0) execjs (2.6.0) fssm (0.2.10) globalid (0.4.0) activesupport (>= 4.2.0) - i18n (0.8.4) + i18n (0.8.6) jbuilder (2.6.3) activesupport (>= 3.0.0, < 5.2) multi_json (~> 1.2) @@ -81,7 +81,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.2.0) - minitest (5.10.2) + minitest (5.10.3) minitest-reporters (1.1.2) ansi builder @@ -136,27 +136,27 @@ GEM rake (10.5.0) rdoc (4.3.0) redcarpet (3.3.2) - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.1) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec (3.6.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-rails (3.4.0) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) + rspec-support (~> 3.6.0) + rspec-rails (3.6.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) ruby-progressbar (1.7.5) sass (3.4.18) sass-rails (5.0.4) @@ -203,7 +203,7 @@ DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter activeresource (= 4.0.0) - appraisal (~> 2.0) + appraisal (= 2.1.0) bcrypt (~> 3.1.7) bundler (~> 1.1) coffee-rails (~> 4.1.0) @@ -223,8 +223,8 @@ DEPENDENCIES rails (~> 4.2.9) rake (>= 10.5.0, < 11) redcarpet - rspec (~> 3.2) - rspec-rails (>= 3.2.0, < 4) + rspec (~> 3.6) + rspec-rails (~> 3.6) sass-rails (~> 5.0) sdoc shoulda-context (~> 1.2.0) @@ -232,7 +232,7 @@ DEPENDENCIES spring-commands-rspec sqlite3 therubyrhino - turbolinks + turbolinks (= 2.5.3) uglifier (>= 1.3.0) yard zeus diff --git a/gemfiles/5.0.gemfile b/gemfiles/5.0.gemfile index 5eae12e2..66dd99bf 100644 --- a/gemfiles/5.0.gemfile +++ b/gemfiles/5.0.gemfile @@ -2,18 +2,18 @@ source "https://rubygems.org" -gem "appraisal", "~> 2.0" +gem "appraisal", "2.1.0" gem "bundler", "~> 1.1" gem "pry" gem "pry-byebug" gem "rake", ">= 10.5.0", "< 11" -gem "rspec", "~> 3.2" +gem "rspec", "~> 3.6" gem "zeus" gem "yard" gem "redcarpet" gem "pygments.rb" gem "fssm" -gem "rspec-rails", ">= 3.2.0", "< 4" +gem "rspec-rails", "~> 3.6" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "pg", :platform => :ruby diff --git a/gemfiles/5.0.gemfile.lock b/gemfiles/5.0.gemfile.lock index ffa968de..e065c017 100644 --- a/gemfiles/5.0.gemfile.lock +++ b/gemfiles/5.0.gemfile.lock @@ -48,13 +48,13 @@ GEM byebug (9.0.6) coderay (1.1.1) concurrent-ruby (1.0.5) - diff-lcs (1.2.5) + diff-lcs (1.3) erubis (2.7.0) ffi (1.9.14) fssm (0.2.10) globalid (0.4.0) activesupport (>= 4.2.0) - i18n (0.8.4) + i18n (0.8.6) jbuilder (2.6.3) activesupport (>= 3.0.0, < 5.2) multi_json (~> 1.2) @@ -70,7 +70,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.2.0) - minitest (5.10.2) + minitest (5.10.3) multi_json (1.12.1) nio4r (2.1.0) nokogiri (1.8.0) @@ -122,27 +122,27 @@ GEM rb-inotify (0.9.7) ffi (>= 0.5.0) redcarpet (3.3.4) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.3) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec (3.6.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) shoulda-context (1.2.1) slop (3.6.0) spring (1.7.2) @@ -174,7 +174,7 @@ PLATFORMS DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter - appraisal (~> 2.0) + appraisal (= 2.1.0) bcrypt (~> 3.1.7) bundler (~> 1.1) fssm @@ -191,8 +191,8 @@ DEPENDENCIES rails-controller-testing (>= 1.0.1) rake (>= 10.5.0, < 11) redcarpet - rspec (~> 3.2) - rspec-rails (>= 3.2.0, < 4) + rspec (~> 3.6) + rspec-rails (~> 3.6) shoulda-context (~> 1.2.0) spring spring-commands-rspec diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1c7a7535..c2967135 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -7,15 +7,14 @@ require 'pry-byebug' require 'rspec' RSpec.configure do |config| - config.order = :random - config.expect_with :rspec do |c| c.syntax = :expect end + config.order = :random config.default_formatter = 'doc' - config.mock_with :rspec + config.example_status_persistence_file_path = 'spec/examples.txt' end $VERBOSE = true