Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update aruba to version 0.14.12 #2140

Merged
merged 1 commit into from
Dec 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Gemfile-rails-dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ else
gem "puma"
end

if RUBY_VERSION < "2.5"
gem "sprockets", "~> 3.0"
end

if version.gsub(/[^\d\.]/,'').to_f >= 6.0
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0.rc1", platforms: [:jruby]
else
Expand Down
18 changes: 8 additions & 10 deletions features/support/env.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,21 @@
require 'fileutils'

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

World(ArubaExt)

Before do
@aruba_timeout_seconds = 30
Aruba.configure do |config|
config.exit_timeout = 30
end

unless File.directory?('./tmp/example_app')
Expand Down
2 changes: 1 addition & 1 deletion rspec-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ Gem::Specification.new do |s|
end

s.add_development_dependency 'cucumber', '~> 1.3.5'
s.add_development_dependency 'aruba', '~> 0.5.4'
s.add_development_dependency 'aruba', '~> 0.14.12'
s.add_development_dependency 'ammeter', '~> 1.1.2'
end