Skip to content

Commit 49425cd

Browse files
authored
Update testing gems (shakacode#397)
1 parent 295b3b2 commit 49425cd

File tree

4 files changed

+28
-30
lines changed

4 files changed

+28
-30
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ group :test do
103103
gem "generator_spec"
104104
gem "launchy"
105105
gem "poltergeist"
106-
gem "rspec-rails", "~> 3"
106+
gem "rspec-rails", "~> 3.6"
107107
gem "rspec-retry"
108108
gem "selenium-webdriver", "<3.0.0"
109109
end

Gemfile.lock

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ GEM
5656
bundler (~> 1.2)
5757
thor (~> 0.18)
5858
byebug (9.0.6)
59-
capybara (2.13.0)
59+
capybara (2.14.0)
6060
addressable
6161
mime-types (>= 1.16)
6262
nokogiri (>= 1.3.3)
@@ -66,8 +66,8 @@ GEM
6666
capybara-screenshot (1.0.14)
6767
capybara (>= 1.0, < 3)
6868
launchy
69-
capybara-webkit (1.14.0)
70-
capybara (>= 2.3.0, < 2.14.0)
69+
capybara-webkit (1.1.0)
70+
capybara (~> 2.0, >= 2.0.2)
7171
json
7272
childprocess (0.6.3)
7373
ffi (~> 1.0, >= 1.0.11)
@@ -110,7 +110,7 @@ GEM
110110
railties (>= 3.0.0)
111111
globalid (0.4.0)
112112
activesupport (>= 4.2.0)
113-
i18n (0.8.1)
113+
i18n (0.8.4)
114114
interception (0.5)
115115
io-like (0.3.0)
116116
jbuilder (2.6.3)
@@ -143,7 +143,7 @@ GEM
143143
parser (2.4.0.0)
144144
ast (~> 2.2)
145145
pg (0.20.0)
146-
poltergeist (1.14.0)
146+
poltergeist (1.15.0)
147147
capybara (~> 2.1)
148148
cliver (~> 0.3.1)
149149
websocket-driver (>= 0.2.0)
@@ -194,7 +194,8 @@ GEM
194194
method_source
195195
rake (>= 0.8.7)
196196
thor (>= 0.18.1, < 2.0)
197-
rainbow (2.2.1)
197+
rainbow (2.2.2)
198+
rake
198199
rake (12.0.0)
199200
rb-fsevent (0.9.8)
200201
rb-inotify (0.9.8)
@@ -207,25 +208,25 @@ GEM
207208
rails (>= 3.2)
208209
rainbow (~> 2.1)
209210
redis (3.3.3)
210-
rspec-core (3.5.4)
211-
rspec-support (~> 3.5.0)
212-
rspec-expectations (3.5.0)
211+
rspec-core (3.6.0)
212+
rspec-support (~> 3.6.0)
213+
rspec-expectations (3.6.0)
213214
diff-lcs (>= 1.2.0, < 2.0)
214-
rspec-support (~> 3.5.0)
215-
rspec-mocks (3.5.0)
215+
rspec-support (~> 3.6.0)
216+
rspec-mocks (3.6.0)
216217
diff-lcs (>= 1.2.0, < 2.0)
217-
rspec-support (~> 3.5.0)
218-
rspec-rails (3.5.2)
218+
rspec-support (~> 3.6.0)
219+
rspec-rails (3.6.0)
219220
actionpack (>= 3.0)
220221
activesupport (>= 3.0)
221222
railties (>= 3.0)
222-
rspec-core (~> 3.5.0)
223-
rspec-expectations (~> 3.5.0)
224-
rspec-mocks (~> 3.5.0)
225-
rspec-support (~> 3.5.0)
226-
rspec-retry (0.5.3)
227-
rspec-core (> 3.3, < 3.6)
228-
rspec-support (3.5.0)
223+
rspec-core (~> 3.6.0)
224+
rspec-expectations (~> 3.6.0)
225+
rspec-mocks (~> 3.6.0)
226+
rspec-support (~> 3.6.0)
227+
rspec-retry (0.5.4)
228+
rspec-core (> 3.3, < 3.7)
229+
rspec-support (3.6.0)
229230
rubocop (0.48.1)
230231
parser (>= 2.3.3.1, < 3.0)
231232
powerpack (~> 0.1)
@@ -296,7 +297,7 @@ GEM
296297
websocket-driver (0.6.5)
297298
websocket-extensions (>= 0.1.0)
298299
websocket-extensions (0.1.2)
299-
xpath (2.0.0)
300+
xpath (2.1.0)
300301
nokogiri (~> 1.3)
301302
yard (0.9.8)
302303

@@ -336,7 +337,7 @@ DEPENDENCIES
336337
rainbow
337338
react_on_rails (= 8.0.1)
338339
redis
339-
rspec-rails (~> 3)
340+
rspec-rails (~> 3.6)
340341
rspec-retry
341342
rubocop
342343
ruby-lint
@@ -354,4 +355,4 @@ RUBY VERSION
354355
ruby 2.4.1p111
355356

356357
BUNDLED WITH
357-
1.15.0
358+
1.15.1

spec/rails_helper.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
Coveralls.wear!("rails") # must occur before any of your application code is required
55
require "spec_helper"
66
require File.expand_path("../../config/environment", __FILE__)
7+
78
require "rspec/rails"
89
require "capybara/rspec"
910
require "capybara/poltergeist"
@@ -20,11 +21,6 @@
2021
# end with _spec.rb. You can configure this pattern with the --pattern
2122
# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
2223
#
23-
# The following line is provided for convenience purposes. It has the downside
24-
# of increasing the boot-up time by auto-requiring all files in the support
25-
# directory. Alternatively, in the individual `*_spec.rb` files, manually
26-
# require only the support files necessary.
27-
#
2824
# Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
2925

3026
# Checks for pending migrations before tests are run.

spec/support/poltergeist.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@
5454

5555
puts "\n"
5656
puts "=" * 80
57-
puts "Exception caught! #{example_ex.ai}"
57+
puts "Exception caught! #{example_ex}"
58+
puts example_ex.message
5859
puts "when running example:\n #{example.full_description}"
5960
puts " at #{example.location} with driver #{Capybara.current_driver}."
6061

0 commit comments

Comments
 (0)