Skip to content

Commit be5a2c5

Browse files
committed
Update Aruba to version 0.14.12
- Bump Aruba version - Force older sprockets on old Rubies - Update overrides to work with Aruba 0.14.12
1 parent a5e23a5 commit be5a2c5

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

Gemfile-rails-dependencies

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ else
3333
gem "puma"
3434
end
3535

36+
if RUBY_VERSION < "2.5"
37+
gem "sprockets", "~> 3.0"
38+
end
39+
3640
if version.gsub(/[^\d\.]/,'').to_f >= 6.0
3741
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0.rc1", platforms: [:jruby]
3842
else

features/support/env.rb

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,21 @@
22
require 'fileutils'
33

44
module ArubaExt
5-
def run(cmd, timeout = nil)
5+
def run_command(cmd, timeout = nil)
66
exec_cmd = cmd =~ /^rspec/ ? "bin/#{cmd}" : cmd
7-
super(exec_cmd, timeout)
8-
end
9-
# This method over rides Aruba 0.5.4 implementation so that we can reset Bundler to use the sample app Gemfile
10-
def in_current_dir(&block)
11-
Bundler.with_clean_env do
12-
_mkdir(current_dir)
13-
Dir.chdir(current_dir, &block)
7+
# Ensure bundler env vars are unset
8+
unset_bundler_env_vars
9+
# Ensure the correct Gemfile is found
10+
in_current_directory do
11+
super(exec_cmd, timeout)
1412
end
1513
end
1614
end
1715

1816
World(ArubaExt)
1917

20-
Before do
21-
@aruba_timeout_seconds = 30
18+
Aruba.configure do |config|
19+
config.exit_timeout = 30
2220
end
2321

2422
unless File.directory?('./tmp/example_app')

rspec-rails.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ Gem::Specification.new do |s|
5555
end
5656

5757
s.add_development_dependency 'cucumber', '~> 1.3.5'
58-
s.add_development_dependency 'aruba', '~> 0.5.4'
58+
s.add_development_dependency 'aruba', '~> 0.14.12'
5959
s.add_development_dependency 'ammeter', '~> 1.1.2'
6060
end

0 commit comments

Comments
 (0)