From 49425cdecff31b68b30ecf6996db5a3c6d03479b Mon Sep 17 00:00:00 2001 From: Justin Gordon Date: Sat, 3 Jun 2017 14:23:36 -1000 Subject: [PATCH] Update testing gems (#397) --- Gemfile | 2 +- Gemfile.lock | 47 +++++++++++++++++++------------------ spec/rails_helper.rb | 6 +---- spec/support/poltergeist.rb | 3 ++- 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/Gemfile b/Gemfile index 38478d20..d8053875 100644 --- a/Gemfile +++ b/Gemfile @@ -103,7 +103,7 @@ group :test do gem "generator_spec" gem "launchy" gem "poltergeist" - gem "rspec-rails", "~> 3" + gem "rspec-rails", "~> 3.6" gem "rspec-retry" gem "selenium-webdriver", "<3.0.0" end diff --git a/Gemfile.lock b/Gemfile.lock index f0fb6d68..0786bf6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,7 +56,7 @@ GEM bundler (~> 1.2) thor (~> 0.18) byebug (9.0.6) - capybara (2.13.0) + capybara (2.14.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -66,8 +66,8 @@ GEM capybara-screenshot (1.0.14) capybara (>= 1.0, < 3) launchy - capybara-webkit (1.14.0) - capybara (>= 2.3.0, < 2.14.0) + capybara-webkit (1.1.0) + capybara (~> 2.0, >= 2.0.2) json childprocess (0.6.3) ffi (~> 1.0, >= 1.0.11) @@ -110,7 +110,7 @@ GEM railties (>= 3.0.0) globalid (0.4.0) activesupport (>= 4.2.0) - i18n (0.8.1) + i18n (0.8.4) interception (0.5) io-like (0.3.0) jbuilder (2.6.3) @@ -143,7 +143,7 @@ GEM parser (2.4.0.0) ast (~> 2.2) pg (0.20.0) - poltergeist (1.14.0) + poltergeist (1.15.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) @@ -194,7 +194,8 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.2.1) + rainbow (2.2.2) + rake rake (12.0.0) rb-fsevent (0.9.8) rb-inotify (0.9.8) @@ -207,25 +208,25 @@ GEM rails (>= 3.2) rainbow (~> 2.1) redis (3.3.3) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.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-retry (0.5.3) - rspec-core (> 3.3, < 3.6) - 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-retry (0.5.4) + rspec-core (> 3.3, < 3.7) + rspec-support (3.6.0) rubocop (0.48.1) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) @@ -296,7 +297,7 @@ GEM websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - xpath (2.0.0) + xpath (2.1.0) nokogiri (~> 1.3) yard (0.9.8) @@ -336,7 +337,7 @@ DEPENDENCIES rainbow react_on_rails (= 8.0.1) redis - rspec-rails (~> 3) + rspec-rails (~> 3.6) rspec-retry rubocop ruby-lint @@ -354,4 +355,4 @@ RUBY VERSION ruby 2.4.1p111 BUNDLED WITH - 1.15.0 + 1.15.1 diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 4c37fde0..2f5d238a 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -4,6 +4,7 @@ Coveralls.wear!("rails") # must occur before any of your application code is required require "spec_helper" require File.expand_path("../../config/environment", __FILE__) + require "rspec/rails" require "capybara/rspec" require "capybara/poltergeist" @@ -20,11 +21,6 @@ # end with _spec.rb. You can configure this pattern with the --pattern # option on the command line or in ~/.rspec, .rspec or `.rspec-local`. # -# The following line is provided for convenience purposes. It has the downside -# of increasing the boot-up time by auto-requiring all files in the support -# directory. Alternatively, in the individual `*_spec.rb` files, manually -# require only the support files necessary. -# # Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f } # Checks for pending migrations before tests are run. diff --git a/spec/support/poltergeist.rb b/spec/support/poltergeist.rb index 239d9bcc..d138d1a0 100644 --- a/spec/support/poltergeist.rb +++ b/spec/support/poltergeist.rb @@ -54,7 +54,8 @@ puts "\n" puts "=" * 80 - puts "Exception caught! #{example_ex.ai}" + puts "Exception caught! #{example_ex}" + puts example_ex.message puts "when running example:\n #{example.full_description}" puts " at #{example.location} with driver #{Capybara.current_driver}."