cucumber 3.0.0.pre.1 → 3.0.0.pre.2

data/features/docs/writing_support_code/tagged_hooks.feature

@@ -4,7 +4,7 @@ Feature: Tagged hooks
     Given the standard step definitions
     And a file named "features/support/hooks.rb" with:
       """
-      Before('~@no-boom') do 
+      Before('not @no-boom') do 
         raise 'boom'
       end
       """

data/features/lib/step_definitions/aruba_steps.rb

@@ -1,27 +1,21 @@
 # frozen_string_literal: true
-Given('a Gemfile with:') do |content|
-  path = File.expand_path(current_dir + "/Gemfile")
-  write_file path, content
-  set_env "BUNDLE_GEMFILE", path
-end
-
 Then(/^it should (pass|fail)$/) do |result|
   assert_success result == 'pass'
 end
 
-Then(/^"([^"]*)" should not be required$/) do |file_name|
+Then('{string} should not be required') do |file_name|
   expect(all_output).not_to include("* #{file_name}")
 end
 
-Then(/^"([^"]*)" should be required$/) do |file_name|
+Then('{string} should be required') do |file_name|
   expect(all_output).to include("* #{file_name}")
 end
 
-Then /^it fails before running features with:$/ do |expected|
+Then('it fails before running features with:') do |expected|
   assert_matching_output("\\A#{expected}", all_output)
   assert_success(false)
 end
 
-Then(/^the output includes the message "(.*)"$/) do |message|
+Then('the output includes the message {string}') do |message|
   expect(all_output).to include(message)
 end

data/features/lib/step_definitions/cli_steps.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
-Then(/^I should see the CLI help$/) do
-  expect(all_output).to include("Usage:")
+Then('I should see the CLI help') do
+  expect(all_output).to include('Usage:')
 end

data/features/lib/step_definitions/cucumber_steps.rb

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
-Given /^a directory without standard Cucumber project directory structure$/ do
+Given('a directory without standard Cucumber project directory structure') do
   in_current_dir do
     FileUtils.rm_rf 'features' if File.directory?('features')
   end
 end
 
-Given /^a scenario with a step that looks like this:$/ do |string|
+Given('a scenario with a step that looks like this:') do |string|
   create_feature do
     create_scenario { string }
   end
 end
 
-Given(/^a scenario with a step that looks like this in japanese:$/) do |string|
+Given('a scenario with a step that looks like this in japanese:') do |string|
   create_feature_ja do
     create_scenario_ja { string }
   end
 end
 
-Given(/^the standard step definitions$/) do
+Given('the standard step definitions') do
   write_file 'features/step_definitions/steps.rb',
 
   <<-STEPS
@@ -29,11 +29,11 @@ Given(/^the standard step definitions$/) do
   STEPS
 end
 
-Given /^a step definition that looks like this:$/ do |string|
+Given('a step definition that looks like this:') do |string|
   create_step_definition { string }
 end
 
-Given /^a scenario "([^\"]*)" that passes$/ do |name|
+Given('a scenario {string} that passes') do |name|
   write_file "features/#{name}.feature",
   <<-FEATURE
   Feature: #{name}
@@ -47,7 +47,7 @@ Given /^a scenario "([^\"]*)" that passes$/ do |name|
   STEPS
 end
 
-Given /^a scenario "([^\"]*)" that fails$/ do |name|
+Given('a scenario {string} that fails') do |name|
   write_file "features/#{name}.feature",
   <<-FEATURE
   Feature: #{name}
@@ -61,15 +61,11 @@ Given /^a scenario "([^\"]*)" that fails$/ do |name|
   STEPS
 end
 
-When /^I run the feature with the (\w+) formatter$/ do |formatter|
+When(/^I run the feature with the (\w+) formatter$/) do |formatter|
   expect(features.length).to eq 1
   run_feature features.first, formatter
 end
 
-Then /^the stderr should contain a warning message$/ do
-  expect(all_stderr).to include("[warning]")
-end
-
 module CucumberHelper
   def run_feature(filename = 'features/a_feature.feature', formatter = 'progress')
     run_simple "#{Cucumber::BINARY} #{filename} --format #{formatter}", false

data/features/lib/step_definitions/iso-8859-1_steps.rb

@@ -4,10 +4,10 @@
 # Alternatively it would be possible to use Norwegian keywords and encode the file as UTF-8.
 #
 # In both cases, stepdef arguments will be sent in as UTF-8, regardless of what encoding is used.
-Given /^jeg drikker en "([^"]*)"$/ do |drink|
+Given(/^jeg drikker en "([^"]*)"$/) do |drink|
   expect(drink).to eq '�l'.encode('UTF-8')
 end
 
-When /^skal de andre si "([^"]*)"$/ do |greeting|
+When(/^skal de andre si "([^"]*)"$/) do |greeting|
   expect(greeting).to eq 'sk�l'.encode('UTF-8')
 end

data/features/lib/step_definitions/json_steps.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-Then /^it should (pass|fail) with JSON:$/ do |pass_fail, json|
+Then(/^it should (pass|fail) with JSON:$/) do |pass_fail, json|
   actual = normalise_json(MultiJson.load(all_stdout))
   expected = MultiJson.load(json)
 

data/features/lib/step_definitions/junit_steps.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-Then(/^the junit output file "(.*?)" should contain:$/) do |actual_file, text|
+Then('the junit output file {string} should contain:') do |actual_file, text|
   actual = IO.read(current_dir + '/' + actual_file)
   actual = replace_junit_time(actual)
   expect(actual).to eq text

data/features/lib/step_definitions/language_steps.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-Then(/^cucumber lists all the supported languages$/) do
-  sample_languages = ["Arabic", "български", "Pirate", "English", "日本語"]
+Then('cucumber lists all the supported languages') do
+  sample_languages = %w(Arabic български Pirate English 日本語)
   sample_languages.each do |language|
     expect(all_output.force_encoding('utf-8')).to include(language)
   end

data/features/lib/step_definitions/profile_steps.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
-Given /^the following profiles? (?:are|is) defined:$/ do |profiles|
+Given('the following profile(s) are/is defined:') do |profiles|
   write_file 'cucumber.yml', profiles
 end
 
-Then /^the (.*) profile should be used$/ do |profile|
+Then('the {word} profile should be used') do |profile|
   step 'the stdout should contain:', profile
 end
 
-Then /^exactly these files should be loaded:\s*(.*)$/ do |files|
-  expect(all_stdout.scan(/^  \* (.*\.rb)$/).flatten).to eq files.split(/,\s+/)
+Then('exactly these files should be loaded: {list}') do |files|
+  expect(all_stdout.scan(/^  \* (.*\.rb)$/).flatten).to eq files
 end
 
-Then /^exactly these features should be run:\s*(.*)$/ do |files|
-  expect(all_stdout.scan(/^  \* (.*\.feature)$/).flatten).to eq files.split(/,\s+/)
+Then('exactly these features should be run: {list}') do |files|
+  expect(all_stdout.scan(/^  \* (.*\.feature)$/).flatten).to eq files
 end

data/features/lib/step_definitions/retry_steps.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-Given /^a scenario "([^\"]*)" that fails once, then passes$/ do |full_name|
+Given('a scenario {string} that fails once, then passes') do |full_name|
   name = snake_case(full_name)
   write_file "features/#{name}.feature",
   <<-FEATURE
@@ -8,7 +8,7 @@ Given /^a scenario "([^\"]*)" that fails once, then passes$/ do |full_name|
       Given it fails once, then passes
   FEATURE
 
-  write_file "features/step_defnitions/#{name}_steps.rb",
+  write_file "features/step_definitions/#{name}_steps.rb",
   <<-STEPS
   Given(/^it fails once, then passes$/) do
     $#{name} += 1
@@ -22,7 +22,7 @@ Given /^a scenario "([^\"]*)" that fails once, then passes$/ do |full_name|
   INIT
 end
 
-Given /^a scenario "([^\"]*)" that fails twice, then passes$/ do |full_name|
+Given('a scenario {string} that fails twice, then passes') do |full_name|
   name = snake_case(full_name)
   write_file "features/#{name}.feature",
   <<-FEATURE

data/features/lib/step_definitions/ruby_steps.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
-When(/^I run the following Ruby code:$/) do |code|
+When('I run the following Ruby code:') do |code|
   run_simple %{ruby -e "#{code}"}
 end

data/features/lib/support/env.rb

@@ -8,7 +8,7 @@ Before('@spawn') do
   Aruba.process = Aruba::SpawnProcess
 end
 
-Before('~@spawn') do
+Before('not @spawn') do
   Aruba::InProcess.main_class = Cucumber::Cli::Main
   Aruba.process = Aruba::InProcess
 end

data/features/lib/support/fake_wire_server.rb

@@ -43,15 +43,20 @@ class FakeWireServer
     end
 
     def start
-      while message = @socket.gets
+      message = @socket.gets
+
+      while message
         handle(message)
+        message = @socket.gets
       end
     end
 
     private
 
     def handle(data)
-      if protocol_entry = response_to(data.strip)
+      protocol_entry = response_to(data.strip)
+
+      if protocol_entry
         sleep delay(data)
         @on_message.call(MultiJson.load(protocol_entry['request'])[0])
         send_response(protocol_entry['response'])

data/features/lib/support/feature_factory.rb

@@ -55,7 +55,7 @@ Feature: #{name}
   end
 
   def filename(name)
-    "features/#{name.downcase.gsub(' ', '_')}.feature"
+    "features/#{name.downcase.tr(' ', '_')}.feature"
   end
 
   def features

data/features/lib/support/normalise_output.rb

@@ -5,12 +5,16 @@ module NormaliseArubaOutput
     normalise_output(super)
   end
 
+  def sanitize_text(text)
+    normalise_output(super)
+  end
+
   def normalise_output(out)
-    out = out.gsub(/#{Dir.pwd}\/tmp\/aruba/, '.') # Remove absolute paths
-    out = out.gsub(/tmp\/aruba\//, '')            # Fix aruba path
-    out = out.gsub(/^.*cucumber_process\.rb.*$\n/, '')
-    out = out.gsub(/^\d+m\d+\.\d+s$/, '0m0.012s') # Make duration predictable
-    out = out.gsub(/Coverage report generated .+$\n/, '') # Remove SimpleCov message
+    out.gsub(/#{Dir.pwd}\/tmp\/aruba/, '.') # Remove absolute paths
+       .gsub(/tmp\/aruba\//, '')            # Fix aruba path
+       .gsub(/^.*cucumber_process\.rb.*$\n/, '')
+       .gsub(/^\d+m\d+\.\d+s$/, '0m0.012s') # Make duration predictable
+       .gsub(/Coverage report generated .+$\n/, '') # Remove SimpleCov message
   end
 
   def normalise_json(json)
@@ -20,7 +24,7 @@ module NormaliseArubaOutput
       elements = feature.fetch('elements') { [] }
       elements.each do |scenario|
         scenario['steps'].each do |step|
-          ['steps', 'before', 'after'].each do |type|
+          %w(steps before after).each do |type|
             if scenario[type]
               scenario[type].each do |step_or_hook|
                 normalise_json_step_or_hook(step_or_hook)
@@ -38,12 +42,9 @@ module NormaliseArubaOutput
   end
 
   def normalise_json_step_or_hook(step_or_hook)
-    if step_or_hook['result']
-      if step_or_hook['result']['duration']
-        expect(step_or_hook['result']['duration']).to be >= 0
-        step_or_hook['result']['duration'] = 1
-      end
-    end
+    return unless step_or_hook['result'] && step_or_hook['result']['duration']
+    expect(step_or_hook['result']['duration']).to be >= 0
+    step_or_hook['result']['duration'] = 1
   end
 
 end

data/features/lib/support/parameter_types.rb

@@ -0,0 +1,8 @@
+ParameterType(
+  name: 'list',
+  regexp: /.*/,
+  type: Array,
+  transformer: ->(s) { s.split(/,\s+/)},
+  use_for_snippets: false,
+  prefer_for_regexp_match: false
+)

data/gem_tasks/contributors.rake

@@ -1,16 +1,19 @@
 # encoding: utf-8
 # frozen_string_literal: true
+
 desc 'List contributors'
 task :contributors do
-  contributors = `git log --pretty=short --no-merges | git shortlog -ne | egrep -ve '^ +' | egrep -ve '^$'`.split("\n")
-  puts contributors
-  puts "Total: #{contributors.length}"
+  IO.popen("git log --pretty=short --no-merges | git shortlog -ne | egrep -ve '^ +' | egrep -ve '^$'") do |f|
+    contributors = f.readlines
+    puts contributors
+    puts "Total: #{contributors.length}"
+  end
 end
 
 task :codeswarm do
-  sh "code_swarm --reload" rescue nil # Fails because of encoding - which we'll fix
-  sh "iconv -f latin1 -t utf-8 .git/.code_swarm/log.xml > tmp.xml && mv tmp.xml .git/.code_swarm/log.xml"
+  sh 'code_swarm --reload' rescue nil # Fails because of encoding - which we'll fix
+  sh 'iconv -f latin1 -t utf-8 .git/.code_swarm/log.xml > tmp.xml && mv tmp.xml .git/.code_swarm/log.xml'
   sh "sed -e 's/Aslak\ Hellesøy@.BEKK.no/aslak.hellesoy@gmail.com/g' .git/.code_swarm/log.xml > tmp.xml && mv tmp.xml .git/.code_swarm/log.xml"
   sh "sed -e 's/josephwilk@joesniff.co.uk/joe@josephwilk.net/g' .git/.code_swarm/log.xml > tmp.xml && mv tmp.xml .git/.code_swarm/log.xml"
-  sh "code_swarm"
+  sh 'code_swarm'
 end

data/gem_tasks/environment.rake

@@ -1,8 +1,4 @@
 # frozen_string_literal: true
 task :ruby_env do
-  RUBY_APP = if RUBY_PLATFORM =~ /java/
-    "jruby"
-  else
-    "ruby"
-  end unless defined? RUBY_APP
+  RUBY_APP ||= RUBY_PLATFORM =~ /java/ ? 'jruby' : 'ruby'
 end

data/gem_tasks/examples.rake

@@ -6,7 +6,7 @@ task :examples do
     puts "Running #{example_dir}"
     Dir.chdir(example_dir) do
       raise "No Rakefile in #{Dir.pwd}" unless File.file?('Rakefile')
-      sh "rake cucumber"
+      sh 'rake cucumber'
     end
   end
 end

data/gem_tasks/fix_cr_lf.rake

@@ -6,6 +6,6 @@ task :fix_cr_lf do
     next if File.directory?(f) || f =~ /dos/
     s = IO.read(f)
     s.gsub!(/\r?\n/, "\n")
-    File.open(f, "w") { |io| io.write(s) }
+    File.open(f, 'w') { |io| io.write(s) }
   end
 end

data/gem_tasks/flog.rake

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-desc "Run flog over significant files"
+desc 'Run flog over significant files'
 task :flog do
-  sh "find lib/cucumber -name \\*.rb | grep -v parser\/feature\\.rb | xargs flog"
+  sh 'find lib/cucumber -name \\*.rb | grep -v parser/feature\\.rb | xargs flog'
 end

data/gem_tasks/rspec.rake

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'rspec/core/rake_task'
 
-desc "Run RSpec"
+desc 'Run RSpec'
 RSpec::Core::RakeTask.new do |t|
   t.verbose = true
 end

data/lib/autotest/cucumber_mixin.rb

@@ -47,7 +47,7 @@ module Autotest::CucumberMixin
   end
 
   def all_features_good
-    features_to_run == ""
+    features_to_run == ''
   end
 
   def get_to_green
@@ -71,27 +71,27 @@ module Autotest::CucumberMixin
     hook :run_features
     Tempfile.open('autotest-cucumber') do |dirty_features_file|
       cmd = self.make_cucumber_cmd(self.features_to_run, dirty_features_file.path)
-      return if cmd.empty?
+      break if cmd.empty?
       puts cmd unless $q
       old_sync = $stdout.sync
       $stdout.sync = true
       self.results = []
       line = []
       begin
-        open("| #{cmd}", "r") do |f|
-          until f.eof? do
+        open("| #{cmd}", 'r') do |f|
+          until f.eof?
             c = f.getc or break
-            if RUBY_VERSION >= "1.9" then
+            if RUBY_VERSION >= '1.9' then
               print c
             else
               putc c
             end
             line << c
             if c == ?\n then
-              self.results << if RUBY_VERSION >= "1.9" then
+              self.results << if RUBY_VERSION >= '1.9' then
                                 line.join
                               else
-                                line.pack "c*"
+                                line.pack 'c*'
                               end
               line.clear
             end
@@ -111,18 +111,18 @@ module Autotest::CucumberMixin
 
     profile_loader = Cucumber::Cli::ProfileLoader.new
 
-    profile ||= "autotest-all" if profile_loader.has_profile?("autotest-all") && features_to_run == :all
-    profile ||= "autotest"     if profile_loader.has_profile?("autotest")
+    profile ||= 'autotest-all' if profile_loader.has_profile?('autotest-all') && features_to_run == :all
+    profile ||= 'autotest'     if profile_loader.has_profile?('autotest')
     profile ||= nil
 
-    if profile
-      args = ["--profile", profile]
-    else
-      args = %w{--format} << (features_to_run == :all ? "progress" : "pretty")
-    end
+    args = if profile
+             ['--profile', profile]
+           else
+             %w{--format} << (features_to_run == :all ? 'progress' : 'pretty')
+           end
     # No --color option as some IDEs (Netbeans) don't output them very well (1 failed step)
     args += %w{--format rerun --out} << dirty_features_filename
-    args << (features_to_run == :all ? "" : features_to_run)
+    args << (features_to_run == :all ? '' : features_to_run)
 
     # Unless I do this, all the steps turn up undefined during the rerun...
     unless features_to_run == :all