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

Update aruba and cucumber, fix global state issue causing unexpected errors in tests

Browse source
This commit is contained in:
Thomas Reynolds 2018-01-25 14:09:18 -08:00
parent 63e20726cb
commit d6f1898c1d
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -6,9 +6,9 @@ gem 'yard', '~> 0.8', require: false
# Test tools
gem 'byebug'
gem 'aruba', '~> 0.7.4', require: false
gem 'aruba', '~> 0.14.0', require: false
gem 'rspec', '~> 3.0', require: false
gem 'cucumber', '~> 2.0', require: false
gem 'cucumber', '~> 3.0', require: false
gem 'addressable', '~> 2.4', require: false
# Pry tools

4
gem_rake_helper.rb
View file

@ -20,14 +20,14 @@ Cucumber::Rake::Task.new do |t|
exempt_tags << '--tags ~@encoding' unless Object.const_defined?(:Encoding)
exempt_tags << '--tags ~@nowindows' if Gem.win_platform?
exempt_tags << '--tags ~@travishatesme' if ENV['TRAVIS'] == 'true'
t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict" # --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict"
end
Cucumber::Rake::Task.new(:cucumber_wip) do |t|
exempt_tags = ['--tags @wip']
exempt_tags << '--tags ~@encoding' unless Object.const_defined?(:Encoding)
exempt_tags << '--tags ~@nowindows' if Gem.win_platform?
t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict" # --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict"
end
require 'rspec/core/rake_task'

8
middleman-core/lib/middleman-core/step_definitions/builder_steps.rb
View file

@ -6,6 +6,10 @@ end
Given /^a built app at "([^\"]*)"$/ do |path|
step %Q{a fixture app "#{path}"}
cwd = File.expand_path(aruba.current_directory)
step %Q{I set the environment variable "MM_ROOT" to "#{cwd}"}
step %Q{I run `middleman build --verbose`}
end
@ -22,6 +26,10 @@ end
Given /^a built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path, flags|
step %Q{a fixture app "#{path}"}
cwd = File.expand_path(aruba.current_directory)
step %Q{I set the environment variable "MM_ROOT" to "#{cwd}"}
step %Q{I run `middleman build #{flags}`}
end

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

@ -5,7 +5,7 @@ When /^I stop (?:middleman|all commands) if the output( of the last command)? co
fail "You need to start middleman interactively first." unless @interactive
if unescape(@interactive.output) =~ Regexp.new(unescape(expected))
only_processes.each { |p| p.terminate }
all_commands.each { |p| p.terminate }
break
end
@ -80,7 +80,7 @@ end
# Make sure each and every process is really dead
After do
only_processes.each { |p| p.terminate }
all_commands.each { |p| p.terminate }
end
Before '@ruby-2.1' do