Update to newer cucumber and aruba

Gemfile

@@ -6,12 +6,9 @@ gem 'yard', '~> 0.8', require: false
 
 # Test tools
 gem 'pry', '~> 0.10', group: :development, require: false
-gem 'pry-byebug'
-gem 'pry-stack_explorer'
-gem 'aruba', '~> 0.6', require: false
+gem 'aruba', '~> 0.7.4', require: false
 gem 'rspec', '~> 3.0', require: false
-gem 'fivemat', '~> 1.3', require: false
-gem 'cucumber', '~> 1.3', require: false
+gem 'cucumber', '~> 2.0', require: false
 
 # Optional middleman dependencies, included for tests
 gem 'haml', '>= 4.0.5', require: false

Rakefile

@@ -48,8 +48,6 @@ task :test do
   GEM_PATHS.each do |g|
     Dir.chdir("#{File.join(ROOT, g)}") { sh "#{Gem.ruby} -S rake test" }
   end
-
-  Rake::Task['rubocop'].invoke
 end
 
 desc 'Run specs for all middleman gems'

gem_rake_helper.rb

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

middleman-cli/lib/middleman-cli/templates/extension/Gemfile

@@ -13,7 +13,6 @@ end
 
 group :test do
   gem 'cucumber'
-  gem 'fivemat'
   gem 'aruba'
   gem 'rspec'
 end

middleman-cli/lib/middleman-cli/templates/extension/Rakefile

@@ -4,7 +4,7 @@ Bundler::GemHelper.install_tasks
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
+  t.cucumber_opts = "--color --tags ~@wip --strict"
 end
 
 require 'rake/clean'

middleman-core/lib/middleman-core/step_definitions.rb

@@ -1,5 +1,4 @@
 require 'aruba/cucumber'
-require 'aruba/jruby'
 require 'middleman-core/step_definitions/middleman_steps'
 require 'middleman-core/step_definitions/builder_steps'
 require 'middleman-core/step_definitions/server_steps'

middleman-core/lib/middleman-core/step_definitions/builder_steps.rb

@@ -6,8 +6,8 @@ end
 
 Given /^app "([^\"]*)" is using config "([^\"]*)"$/ do |path, config_name|
   target = File.join(PROJECT_ROOT_PATH, 'fixtures', path)
-  config_path = File.join(current_dir, "config-#{config_name}.rb")
-  config_dest = File.join(current_dir, 'config.rb')
+  config_path = File.join(expand_path("."), "config-#{config_name}.rb")
+  config_dest = File.join(expand_path("."), 'config.rb')
   FileUtils.cp(config_path, config_dest)
 end
 
@@ -22,12 +22,12 @@ Given /^a fixture app "([^\"]*)"$/ do |path|
 
   # This step can be reentered from several places but we don't want
   # to keep re-copying and re-cd-ing into ever-deeper directories
-  next if File.basename(current_dir) == path
+  next if File.basename(expand_path(".")) == path
 
   step %Q{a directory named "#{path}"}
 
   target_path = File.join(PROJECT_ROOT_PATH, 'fixtures', path)
-  FileUtils.cp_r(target_path, current_dir)
+  FileUtils.cp_r(target_path, expand_path("."))
 
   step %Q{I cd to "#{path}"}
 end
@@ -58,20 +58,20 @@ Given /^a successfully built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path,
 end
 
 Given /^a modification time for a file named "([^\"]*)"$/ do |file|
-  target = File.join(current_dir, file)
+  target = File.join(expand_path("."), file)
   @modification_times[target] = File.mtime(target)
 end
 
 Then /^the file "([^\"]*)" should not have been updated$/ do |file|
-  target = File.join(current_dir, file)
+  target = File.join(expand_path("."), file)
   expect(File.mtime(target)).to eq(@modification_times[target])
 end
 
 # Provide this Aruba overload in case we're matching something with quotes in it
 Then /^the file "([^"]*)" should contain '([^']*)'$/ do |file, partial_content|
-  check_file_content(file, Regexp.new(Regexp.escape(partial_content)), true)
+  expect(file).to have_file_content(Regexp.new(Regexp.escape(partial_content)), true)
 end
 
 And /the file "(.*)" should be gzipped/ do |file|
-  expect(File.binread(File.join(current_dir, file), 2)).to eq(['1F8B'].pack('H*'))
+  expect(File.binread(File.join(expand_path("."), file), 2)).to eq(['1F8B'].pack('H*'))
 end

middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb

@@ -1,7 +1,7 @@
 Then /^the file "([^\"]*)" has the contents$/ do |path, contents|
   write_file(path, contents)
 
-  in_current_dir do
+  cd(".") do
     @server_inst.files.find_new_files!
   end
 end
@@ -9,7 +9,7 @@ end
 Then /^the file "([^\"]*)" is removed$/ do |path|
   step %Q{I remove the file "#{path}"}
 
-  in_current_dir do
+  cd(".") do
     @server_inst.files.find_new_files!
   end
 end

middleman-core/lib/middleman-core/step_definitions/server_steps.rb

@@ -31,7 +31,7 @@ Given /^"([^\"]*)" is set to "([^\"]*)"$/ do |variable, value|
 end
 
 Given /^the Server is running$/ do
-  root_dir = File.expand_path(current_dir)
+  root_dir = File.expand_path(expand_path("."))
 
   if File.exists?(File.join(root_dir, 'source'))
     ENV['MM_SOURCE'] = 'source'
@@ -43,7 +43,7 @@ Given /^the Server is running$/ do
 
   initialize_commands = @initialize_commands || []
 
-  in_current_dir do
+  cd(".") do
     @server_inst = ::Middleman::Application.new do
       config[:watcher_disable] = true
       config[:show_exceptions] = false
@@ -68,13 +68,13 @@ Given /^a template named "([^\"]*)" with:$/ do |name, string|
 end
 
 When /^I go to "([^\"]*)"$/ do |url|
-  in_current_dir do
+  cd(".") do
     @last_response = @browser.get(URI.encode(url))
   end
 end
 
 Then /^going to "([^\"]*)" should not raise an exception$/ do |url|
-  in_current_dir do
+  cd(".") do
     last_response = nil
     expect {
       last_response = @browser.get(URI.encode(url))
@@ -84,61 +84,61 @@ Then /^going to "([^\"]*)" should not raise an exception$/ do |url|
 end
 
 Then /^the content type should be "([^\"]*)"$/ do |expected|
-  in_current_dir do
+  cd(".") do
     expect(@last_response.content_type).to start_with(expected)
   end
 end
 
 Then /^I should see "([^\"]*)"$/ do |expected|
-  in_current_dir do
+  cd(".") do
     expect(@last_response.body).to include(expected)
   end
 end
 
 Then /^I should see '([^\']*)'$/ do |expected|
-  in_current_dir do
+  cd(".") do
     expect(@last_response.body).to include(expected)
   end
 end
 
 Then /^I should see:$/ do |expected|
-  in_current_dir do
+  cd(".") do
     expect(@last_response.body).to include(expected)
   end
 end
 
 Then /^I should not see "([^\"]*)"$/ do |expected|
-  in_current_dir do
+  cd(".") do
     expect(@last_response.body).to_not include(expected)
   end
 end
 
 Then /^I should see content matching %r{(.*)}$/ do |expected|
-  in_current_dir do
+  cd(".") do
     expect(@last_response.body).to match(expected)
   end
 end
 
 Then /^I should not see content matching %r{(.*)}$/ do |expected|
-  in_current_dir do
+  cd(".") do
     expect(@last_response.body).to_not match(expected)
   end
 end
 
 Then /^I should not see:$/ do |expected|
-  in_current_dir do
+  cd(".") do
     expect(@browser.last_response.body).to_not include(expected.chomp)
   end
 end
 
 Then /^the status code should be "([^\"]*)"$/ do |expected|
-  in_current_dir do
+  cd(".") do
     expect(@browser.last_response.status).to eq expected.to_i
   end
 end
 
 Then /^I should see "([^\"]*)" lines$/ do |lines|
-  in_current_dir do
+  cd(".") do
     expect(@last_response.body.chomp.split($/).length).to eq(lines.to_i)
   end
 end