kotovalexarian-likes-github/middleman--middleman
1
0
Fork 0
mirror of https://github.com/middleman/middleman.git synced 2022-11-09 12:20:27 -05:00
Code Releases Activity

Upgrade aruba

Browse source
This commit is contained in:
Thomas Reynolds 2020-09-15 19:12:18 +00:00
parent d2196623f1
commit d2668741d1
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -8,7 +8,7 @@ gem 'yard', '~> 0.9.11', require: false
# Test tools
gem 'addressable', '~> 2.4', require: false
gem 'aruba', '~> 0.14.0', require: false
gem 'aruba', '~> 1.0.0', require: false
gem 'byebug'
gem 'capybara', '~> 3.33.0', require: false
gem 'cucumber', '~> 5.1', require: false

16
Gemfile.lock
View file

@ -42,13 +42,13 @@ GEM
zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
aruba (0.14.14)
childprocess (>= 0.6.3, < 4.0.0)
contracts (~> 0.9)
cucumber (>= 1.3.19)
aruba (1.0.3)
childprocess (>= 2.0, < 5.0)
contracts (~> 0.16.0)
cucumber (>= 2.4, < 6.0)
ffi (~> 1.9)
rspec-expectations (>= 2.99)
thor (>= 0.19, < 2.0)
rspec-expectations (~> 3.4)
thor (~> 1.0)
ast (2.4.1)
async (1.26.2)
console (~> 1.0)
@ -70,7 +70,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
childprocess (3.0.0)
childprocess (4.0.0)
coderay (1.1.3)
coffee-script (2.4.1)
coffee-script-source
@ -257,7 +257,7 @@ PLATFORMS
DEPENDENCIES
addressable (~> 2.4)
aruba (~> 0.14.0)
aruba (~> 1.0.0)
byebug
capybara (~> 3.33.0)
coffee-script (~> 2.2)

2
middleman-core/cucumber.yml
View file

@ -1,2 +1,2 @@
default: --fail-fast --require features --tags 'not @wip'
default: --publish-quiet --fail-fast --require features --tags 'not @wip'
wip: --fail-fast --require features --tags @wip

12
middleman-core/lib/middleman-core/step_definitions/commandline_steps.rb
View file

@ -8,18 +8,18 @@ end
When /^I wait for the output to contain:$/ do |expected|
Timeout.timeout(aruba.config.exit_timeout) do
loop do
raise 'You need to start middleman interactively first.' unless @interactive
raise 'You need to start middleman interactively first.' unless last_command_started
break if sanitize_text(@interactive.output)&.match?(Regexp.new(sanitize_text(expected)))
break if sanitize_text(last_command_started.output)&.match?(Regexp.new(sanitize_text(expected)))
sleep 0.1
end
end
rescue ChildProcess::TimeoutError, TimeoutError
@interactive.terminate
rescue ChildProcess::TimeoutError, Timeout::Error
last_command_started.terminate
ensure
aruba.announcer.announce(:stdout, @interactive.stdout)
aruba.announcer.announce(:stderr, @interactive.stderr)
aruba.announcer.announce(:stdout, last_command_started.stdout)
aruba.announcer.announce(:stderr, last_command_started.stderr)
end
# Make it just a long running process