cucumber 1.2.1 → 1.2.2

data/features/step_definitions/cucumber_steps.rb

@@ -2,16 +2,31 @@ When /^I run cucumber "(.+)"$/ do |cmd|
   run_simple(unescape("cucumber #{cmd}"), false)
 end
 
+Then 'it should pass' do
+  assert_exit_status 0
+end
+
 Then /^it should (pass|fail) with JSON:$/ do |pass_fail, json|
   # Need to store it in a variable. With JRuby we can only do this once it seems :-/
   stdout = all_stdout
-  
+
   # JRuby has weird traces sometimes (?)
-  stdout = stdout.gsub(/ `\(root\)':in/, '') 
+  stdout = stdout.gsub(/ `\(root\)':in/, '')
 
   actual = JSON.parse(stdout)
   expected = JSON.parse(json)
-  
+
+  #make sure duration was captured (should be >= 0)
+  #then set it to what is "expected" since duration is dynamic
+  actual.each do |feature|
+    feature['elements'].each do |scenario|
+      scenario['steps'].each do |step|
+        step['result']['duration'].should be >= 0
+        step['result']['duration'] = 1
+      end
+    end
+  end
+
   actual.should == expected
   assert_success(pass_fail == 'pass')
 end

data/fixtures/self_test/features/support/env.rb

@@ -1,6 +1,6 @@
 require 'base64'
 begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
-$KCODE = 'u' unless Cucumber::RUBY_1_9
+$KCODE = 'u' if Cucumber::RUBY_1_8_7
 
 Before('@not_used') do
   raise "Should never run"

data/gem_tasks/cucumber.rake

@@ -3,12 +3,14 @@ require 'cucumber/platform'
 
 class Cucumber::Rake::Task
   def set_profile_for_current_ruby
-    self.profile = if(Cucumber::JRUBY)
+    self.profile = if Cucumber::JRUBY
       Cucumber::WINDOWS ? 'jruby_win' : 'jruby'
-    elsif(Cucumber::WINDOWS_MRI)
+    elsif Cucumber::WINDOWS_MRI
       'windows_mri'
-    elsif(Cucumber::RUBY_1_9)
+    elsif Cucumber::RUBY_1_9
       'ruby_1_9'
+    elsif Cucumber::RUBY_2_0
+      'ruby_2_0'
     end
   end
 end

data/gem_tasks/downloads.rb

@@ -1,7 +1,7 @@
-require 'json'
 require 'httparty'
+require 'multi_json'
 
 IO.read(File.dirname(__FILE__) + '/versions.txt').each_line do |version|
   json = HTTParty.get("http://rubygems.org/api/v1/downloads/cucumber-#{version.strip}.json")
-  puts JSON.parse(json.body)['version_downloads']
-end
+  puts MultiJson.load(json.body)['version_downloads']
+end

data/gem_tasks/stats

@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 echo 'Commits'
 git log --pretty=format:'' | wc -l
 
@@ -8,7 +10,7 @@ echo 'Resolved bugs/feature requests'
 egrep -e '^\*' History.md | wc -l
 
 echo 'Open tickets'
-curl -s http://github.com/api/v2/json/issues/list/cucumber/cucumber/open | ruby -e "require 'json'; puts JSON.parse(STDIN.read)['issues'].length"
+curl -s https://api.github.com/repos/cucumber/cucumber/issues?state=open | ruby -e "require 'multi_json'; puts MultiJson.load(STDIN.read).length"
 
 echo 'Group members'
-curl -s http://groups.google.com/group/cukes | grep Members
+curl -s http://groups.google.com/group/cukes | grep Members

data/gem_tasks/yard.rake

@@ -1,18 +1,36 @@
 require 'yard'
 require 'yard/rake/yardoc_task'
-require 'cucumber/platform'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/cucumber/platform')
 
-YARD::Templates::Engine.register_template_path(File.expand_path(File.join(File.dirname(__FILE__), 'yard')))
-YARD::Rake::YardocTask.new(:yard) do |t|
-  t.options = %w{--no-private --title Cucumber}
-  t.files = %w{lib - README.md History.md LICENSE}
-end
+SITE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../cucumber.github.com')
+API_DIR  = File.join(SITE_DIR, 'api', 'cucumber', 'ruby', 'yardoc')
 
-desc "Push yardoc to http://cukes.info/cucumber/api/#{Cucumber::VERSION}"
-task :push_yard => :yard do
-  sh("tar czf api-#{Cucumber::VERSION}.tgz -C doc .")
-  sh("scp api-#{Cucumber::VERSION}.tgz cukes.info:/var/www/cucumber/api/ruby")
-  sh("ssh cukes.info 'cd /var/www/cucumber/api/ruby && rm -rf #{Cucumber::VERSION} && mkdir #{Cucumber::VERSION} && tar xzf api-#{Cucumber::VERSION}.tgz -C #{Cucumber::VERSION} && rm -f latest && ln -s #{Cucumber::VERSION} latest'")
-end
+namespace :api do
+  file :dir do
+    unless File.directory?(SITE_DIR)
+      raise "You need to git clone git@github.com:cucumber/cucumber.github.com.git #{SITE_DIR}"
+    end
+    sh('git pull -u')
+    mkdir_p API_DIR
+  end
+
+  template_path = File.expand_path(File.join(File.dirname(__FILE__), 'yard'))
+  YARD::Templates::Engine.register_template_path(template_path)
+  YARD::Rake::YardocTask.new(:yard) do |yard|
+    dir = API_DIR
+    mkdir_p dir
+    yard.options = ["--out", dir]
+  end
+  task :yard => :dir
 
-#task :release => :push_yard
+  task :release do
+    Dir.chdir(SITE_DIR) do
+      sh('git add .')
+      sh("git commit -m 'Update API docs for Cucumber-Ruby v#{Cucumber::VERSION}'")
+      sh('git push')
+    end
+  end
+
+  desc "Generate YARD docs for Cucumber's API"
+  task :doc => [:yard, :release]
+end

data/legacy_features/default_snippets.feature

@@ -26,11 +26,11 @@ Feature: Print snippets
 
       You can implement step definitions for undefined steps with these snippets:
       
-      Given /^Z$/ do
+      Given(/^Z$/) do
         pending # express the regexp above with the code you wish you had
       end
 
-      Given /^Q$/ do
+      Given(/^Q$/) do
         pending # express the regexp above with the code you wish you had
       end
 
@@ -40,4 +40,4 @@ Feature: Print snippets
 
 
       """
-  
+  

data/legacy_features/language_help.feature

@@ -46,9 +46,11 @@ Feature: Language help
             | eo        | Esperanto           | Esperanto         |
             | es        | Spanish             | español           |
             | et        | Estonian            | eesti keel        |
+            | fa        | Persian             | فارسی             |
             | fi        | Finnish             | suomi             |
             | fr        | French              | français          |
             | he        | Hebrew              | עברית             |
+            | hi        | Hindi               | हिंदी             |
             | hr        | Croatian            | hrvatski          |
             | hu        | Hungarian           | magyar            |
             | id        | Indonesian          | Bahasa Indonesia  |
@@ -69,7 +71,9 @@ Feature: Language help
             | sr-Cyrl   | Serbian             | Српски            |
             | sr-Latn   | Serbian (Latin)     | Srpski (Latinica) |
             | sv        | Swedish             | Svenska           |
+            | tl        | Telugu              | తెలుగు            |
             | tr        | Turkish             | Türkçe            |
+            | tt        | Tatar               | Татарча           |
             | uk        | Ukrainian           | Українська        |
             | uz        | Uzbek               | Узбекча           |
             | vi        | Vietnamese          | Tiếng Việt        |

data/legacy_features/report_called_undefined_steps.feature

@@ -25,7 +25,7 @@ Feature: Cucumber command line
 
       You can implement step definitions for undefined steps with these snippets:
 
-      Given /^this does not exist$/ do
+      Given(/^this does not exist$/) do
         pending # express the regexp above with the code you wish you had
       end
 

data/legacy_features/snippet.feature

@@ -7,7 +7,7 @@ Feature: Snippets
     When I run cucumber features/undefined_multiline_args.feature:3 -s
     Then the output should contain
       """
-      Given /^a pystring$/ do |string|
+      Given(/^a pystring$/) do |string|
         pending # express the regexp above with the code you wish you had
       end
       """
@@ -16,8 +16,8 @@ Feature: Snippets
     When I run cucumber features/undefined_multiline_args.feature:9 -s
     Then the output should contain
       """
-      Given /^a table$/ do |table|
+      Given(/^a table$/) do |table|
         # table is a Cucumber::Ast::Table
         pending # express the regexp above with the code you wish you had
       end
-      """
+      """

data/legacy_features/snippets_when_using_star_keyword.feature

@@ -25,7 +25,7 @@ Feature: Use * keywords and still get snippets
       
       You can implement step definitions for undefined steps with these snippets:
       
-      Given /^I have some cukes$/ do
+      Given(/^I have some cukes$/) do
         pending # express the regexp above with the code you wish you had
       end
       

data/legacy_features/step_definitions/cucumber_steps.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'multi_json'
 require 'tempfile'
 
 Given /^I am in (.*)$/ do |example_dir_relative_path|
@@ -95,7 +96,7 @@ Then /^the output should be$/ do |text|
 end
 
 Then /^it should (fail|pass) with JSON$/ do |success, text|
-  JSON.parse(last_stdout).should == JSON.parse(text)
+  MultiJson.load(last_stdout).should == MultiJson.load(text)
   Then("it should #{success}")
 end
 
@@ -105,7 +106,7 @@ end
 
 Then /^"([^"]*)" with junit duration "([^"]*)" should contain$/ do |actual_file, duration_replacement, text|
   actual = IO.read(actual_file)
-  actual = replace_junit_duration(actual, duration_replacement) 
+  actual = replace_junit_duration(actual, duration_replacement)
   actual = strip_ruby186_extra_trace(actual)
   actual.should == text
 end
@@ -168,5 +169,5 @@ Then /^print output$/ do
 end
 
 Then /^the output should contain the following JSON:$/ do |json_string|
-  JSON.parse(last_stdout).should == JSON.parse(json_string)
+  MultiJson.load(last_stdout).should == MultiJson.load(json_string)
 end

data/legacy_features/support/env.rb

@@ -101,7 +101,7 @@ class CucumberWorld
     stderr_file = Tempfile.new('cucumber')
     stderr_file.close
     in_current_dir do
-      mode = Cucumber::RUBY_1_9 ? {:external_encoding=>"UTF-8"} : 'r'
+      mode = Cucumber::RUBY_1_8_7 ? 'r' : {:external_encoding=>"UTF-8"}
       IO.popen("#{command} 2> #{stderr_file.path}", mode) do |io|
         @last_stdout = io.read
       end

data/legacy_features/support/fake_wire_server.rb

@@ -1,5 +1,5 @@
+require 'multi_json'
 require 'socket'
-require 'json'
 
 class FakeWireServer
   def initialize(port, protocol_table)
@@ -11,7 +11,7 @@ class FakeWireServer
     @server = TCPServer.open(@port)
     loop { handle_connections }
   end
-  
+
   def delay_response(message, delay)
     @delays[message] = delay
   end
@@ -31,7 +31,7 @@ class FakeWireServer
       socket.close
     end
   end
-  
+
   class SocketSession
     def initialize(socket, protocol, delays)
       @socket = socket
@@ -46,7 +46,7 @@ class FakeWireServer
     end
 
     private
-    
+
     def handle(data)
       if protocol_entry = response_to(data.strip)
         sleep delay(data)
@@ -60,18 +60,18 @@ class FakeWireServer
     end
 
     def response_to(data)
-      @protocol.detect do |entry| 
-        JSON.parse(entry['request']) == JSON.parse(data)
+      @protocol.detect do |entry|
+        MultiJson.load(entry['request']) == MultiJson.load(data)
       end
     end
 
     def send_response(response)
       @socket.puts response + "\n"
     end
-    
+
     def delay(data)
-      message = JSON.parse(data.strip)[0]
+      message = MultiJson.load(data.strip)[0]
       @delays[message.to_sym] || 0
     end
   end
-end
+end

data/lib/autotest/cucumber_mixin.rb

@@ -7,14 +7,14 @@ module Autotest::CucumberMixin
   def self.included(receiver)
     receiver::ALL_HOOKS << [:run_features, :ran_features]
   end
-  
+
   attr_accessor :features_to_run
-  
+
   def initialize
     super
     reset_features
   end
-  
+
   def run
     hook :initialize
     reset
@@ -44,11 +44,11 @@ module Autotest::CucumberMixin
     end
     hook :quit
   end
-  
+
   def all_features_good
     features_to_run == ""
   end
-  
+
   def get_to_green
     begin
       super
@@ -56,16 +56,16 @@ module Autotest::CucumberMixin
       wait_for_changes unless all_features_good
     end until all_features_good
   end
-  
+
   def rerun_all_features
     reset_features
     run_features
   end
-  
+
   def reset_features
     self.features_to_run = :all
   end
-    
+
   def run_features
     hook :run_features
     Tempfile.open('autotest-cucumber') do |dirty_features_file|
@@ -104,16 +104,16 @@ module Autotest::CucumberMixin
     end
     hook :ran_features
   end
-  
+
   def make_cucumber_cmd(features_to_run, dirty_features_filename)
     return '' if features_to_run == ''
-    
+
     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 ||= nil
-    
+
     if profile
       args = ["--profile", profile]
     else
@@ -122,12 +122,12 @@ module Autotest::CucumberMixin
     # 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)
-    
+
     # Unless I do this, all the steps turn up undefined during the rerun...
     unless features_to_run == :all
       args << 'features/step_definitions' << 'features/support'
     end
-    
+
     args = args.join(' ')
 
     return "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} #{args}"

data/lib/autotest/discover.rb

@@ -2,6 +2,8 @@ Autotest.add_discovery do
   if File.directory?('features')
     if ENV['AUTOFEATURE'] =~ /true/i
       "cucumber"
+    elsif ENV['AUTOFEATURE'] =~ /false/i
+      # noop
     else
       puts "(Not running features.  To run features in autotest, set AUTOFEATURE=true.)"
     end

data/lib/cucumber.rb

@@ -13,14 +13,14 @@ require 'cucumber/term/ansicolor'
 module Cucumber
   class << self
     attr_accessor :wants_to_quit
-    
+
     def logger
       return @log if @log
       @log = Logger.new(STDOUT)
       @log.level = Logger::INFO
       @log
     end
-    
+
     def logger=(logger)
       @log = logger
     end

data/lib/cucumber/ast.rb

@@ -27,4 +27,4 @@ module Cucumber
   # for an example.
   module Ast
   end
-end
+end

data/lib/cucumber/ast/background.rb

@@ -22,7 +22,7 @@ module Cucumber
 
       def step_collection(step_invocations)
         init
-        unless(@first_collection_created)
+        unless((defined? @first_collection_created) and @first_collection_created)
           @first_collection_created = true
           @step_invocations.dup(step_invocations)
         else
@@ -36,14 +36,14 @@ module Cucumber
         visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_background_name(@keyword, name, file_colon_line(@line), source_indent(first_line_length))
         with_visitor(hook_context, visitor) do
-          visitor.step_mother.before(hook_context)
+          visitor.runtime.before(hook_context)
           skip_invoke! if failed?
           visitor.visit_steps(@step_invocations)
           @failed = @step_invocations.detect{|step_invocation| step_invocation.exception || step_invocation.status != :passed }
-          visitor.step_mother.after(hook_context) if @failed || @feature_elements.empty?
+          visitor.runtime.after(hook_context) if @failed || @feature_elements.empty?
         end
       end
-      
+
       def with_visitor(scenario, visitor)
         @current_visitor = visitor
         init
@@ -55,7 +55,7 @@ module Cucumber
           yield
         end
       end
-      
+
       def accept_hook?(hook)
         init
         if hook_context != self
@@ -71,7 +71,11 @@ module Cucumber
       end
 
       def failed?
-        @failed
+        if defined? @failed
+          return @failed
+        else
+          return nil
+        end
       end
 
       def hook_context
@@ -92,7 +96,7 @@ module Cucumber
       def fail!(exception)
         @failed = true
         @exception = exception
-        @current_visitor.visit_exception(@exception, :failed)        
+        @current_visitor.visit_exception(@exception, :failed)
       end