cucumber 0.3.11 → 0.3.90

data/features/junit_formatter.feature

@@ -13,7 +13,7 @@ Feature: JUnit output formatter
       """
 
       """
-    And "examples/junit/tmp/TEST-One_passing_scenario__one_failing_scenario.xml" should contain XML
+    And "examples/junit/tmp/TEST-one_passing_one_failing.xml" should contain XML
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" tests="2" name="One passing scenario, one failing scenario" failures="1">
@@ -36,7 +36,7 @@ Feature: JUnit output formatter
       """
       
       """
-    And "examples/junit/tmp/TEST-Pending_step.xml" should contain XML
+    And "examples/junit/tmp/TEST-pending.xml" should contain XML
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" tests="1" name="Pending step" failures="1">
@@ -56,8 +56,8 @@ Feature: JUnit output formatter
       """
       
       """
-    And "examples/junit/tmp/TEST-One_passing_scenario__one_failing_scenario.xml" should exist
-    And "examples/junit/tmp/TEST-Pending_step.xml" should exist
+    And "examples/junit/tmp/TEST-one_passing_one_failing.xml" should exist
+    And "examples/junit/tmp/TEST-pending.xml" should exist
   
   Scenario: show correct error message if no --out is passed
     When I run cucumber --format junit features

data/features/language_from_header.feature

@@ -0,0 +1,30 @@
+Feature: Language from header
+  In order to simplify command line and
+  settings in IDEs, Cucumber should pick
+  up parser language from a header.
+  
+  Scenario: LOLCAT
+    Given a standard Cucumber project directory structure
+    And a file named "features/lolcat.feature" with:
+      """
+      # language: en-lol
+      OH HAI: STUFFING
+        B4: HUNGRY
+        MISHUN: CUKES
+          DEN KTHXBAI
+      """
+    When I run cucumber -i features/lolcat.feature
+    Then it should pass with
+      """
+      # language: en-lol
+      OH HAI: STUFFING
+
+        B4: HUNGRY # features/lolcat.feature:3
+
+        MISHUN: CUKES # features/lolcat.feature:4
+          DEN KTHXBAI # features/lolcat.feature:5
+
+      1 scenario (1 undefined)
+      1 step (1 undefined)
+
+      """

data/features/rake_task.feature

@@ -148,3 +148,31 @@ Feature: Rake task
       """
         * features/support/dont_require_me.rb
       """
+
+  Scenario: feature files with spaces
+    Given a file named "features/spaces are nasty.feature" with:
+       """
+       Feature: The futures green
+
+         Scenario: Orange
+           Given this is missing
+       """
+    And a file named "Rakefile" with:
+       """
+       $LOAD_PATH.unshift(CUCUMBER_LIB)
+       require 'cucumber/rake/task'
+
+       Cucumber::Rake::Task.new(:features) do |t|
+         t.cucumber_opts = %w{--quiet --no-color}
+       end
+       """
+    When I run rake features
+    Then it should pass
+    And the output should contain
+       """
+       Feature: The futures green
+
+         Scenario: Orange
+           Given this is missing
+
+       """

data/features/step_definitions/cucumber_steps.rb

@@ -31,8 +31,8 @@ Given /^the following profiles? (?:are|is) defined:$/ do |profiles|
   create_file('cucumber.yml', profiles)
 end
 
-Given /^I am running "([^\"]*)" in the background$/ do |command|
-  run_in_background command
+Given /^I am running spork in the background$/ do
+  run_spork_in_background
 end
 
 Given /^I am not running (?:.*) in the background$/ do

data/features/steps_formatter.feature

@@ -0,0 +1,25 @@
+Feature: --formatter steps option - Steps Formatter
+  In order to easily see which steps are already defined,
+  specially when using 3rd party steps libraries,
+  Cucumber should show the available steps in a user-friendly format
+
+  Background:
+    Given I am in steps_library
+
+  Scenario: Printing steps
+    When I run cucumber -f steps features
+    Then it should pass with
+    """
+    features/step_definitions/steps_lib1.rb
+      /^I defined a first step$/           # features/step_definitions/steps_lib1.rb:1
+      /^I define a second step$/           # features/step_definitions/steps_lib1.rb:4
+      /^I should also have a third step$/  # features/step_definitions/steps_lib1.rb:7
+    
+    features/step_definitions/steps_lib2.rb
+      /^I defined a step 4$/                # features/step_definitions/steps_lib2.rb:1
+      /^I create a step 5$/                 # features/step_definitions/steps_lib2.rb:4
+      /^I should be too tired for step 6$/  # features/step_definitions/steps_lib2.rb:7
+    
+    6 step definition(s) in 2 source file(s).
+
+    """

data/features/support/env.rb

@@ -4,7 +4,7 @@ require 'spec/expectations'
 require 'fileutils'
 require 'forwardable'
 begin
-  require 'spork'
+  gem "spork", ">= 0.5.1" # Ensure correct spork version number to avoid false-negatives.
 rescue Gem::LoadError => ex
   warn "WARNING: #{ex.message} You need to have the spork gem installed to run the DRb feature properly!"
 end
@@ -70,22 +70,30 @@ class CucumberWorld
     stderr_file.close
     in_current_dir do
       @last_stdout = `#{command} 2> #{stderr_file.path}`
+      mode = Cucumber::RUBY_1_9 ? {:external_encoding=>"UTF-8"} : 'r'
+      IO.popen("#{command} 2> #{stderr_file.path}", mode) do |io|
+        @last_stdout = io.read
+      end
+
       @last_exit_status = $?.exitstatus
     end
     @last_stderr = IO.read(stderr_file.path)
   end
 
-  def run_in_background(command)
+  def run_spork_in_background
     pid = fork
     in_current_dir do
       if pid
         background_jobs << pid
       else
-        #STDOUT.close
-        #STDERR.close
-        exec command
+        # STDOUT.close
+        # STDERR.close
+        spork = `which spork`.strip
+        cmd = "#{Cucumber::RUBY_BINARY} -I #{Cucumber::LIBDIR} #{spork} cuc"
+        exec cmd
       end
     end
+    sleep 0.2
   end
 
   def terminate_background_jobs

data/features/table_diffing.feature

@@ -0,0 +1,45 @@
+Feature: Table diffing
+  In order to more easily compare data in tables
+  step definition writers should be able to diff
+  a table with expected data and see the diff inline
+  
+  Scenario: Extra row
+    Given a standard Cucumber project directory structure
+    And a file named "features/tables.feature" with:
+      """
+      Feature: Tables
+        Scenario: Extra row
+          Then the table should be:
+            | x | y |
+            | a | b |
+      """
+    And a file named "features/step_definitions/table_steps.rb" with:
+      """
+      Then /the table should be:/ do |expected|
+        expected.diff!(table(%{
+          | x | y | 
+          | a | c |
+        }))
+      end
+      """
+    When I run cucumber -i features/tables.feature
+    Then it should fail with
+      """
+      Feature: Tables
+      
+        Scenario: Extra row         # features/tables.feature:2
+          Then the table should be: # features/step_definitions/table_steps.rb:1
+            | x | y |
+            | a | b |
+            | a | c |
+            Tables were not identical (RuntimeError)
+            ./features/step_definitions/table_steps.rb:2:in `/the table should be:/'
+            features/tables.feature:3:in `Then the table should be:'
+      
+      Failing Scenarios:
+      cucumber features/tables.feature:2 # Scenario: Extra row
+
+      1 scenario (1 failed)
+      1 step (1 failed)
+
+      """

data/features/unicode_table.feature

@@ -0,0 +1,35 @@
+Feature: Unicode in tables
+  In order to please the whole world,
+  unicode characters in tables should be
+  properly aligned
+  
+  Scenario: All sorts of weird stuff
+    Given a standard Cucumber project directory structure
+    And a file named "features/unicode.feature" with:
+      """
+      Feature: Featuring unicode
+
+        Scenario: So what, whatever
+          Given passing
+            | Brüno | abc |
+            | Bruno | æøå |
+      """
+    And a file named "features/env.rb" with:
+      """
+      $KCODE='u'
+      """
+    When I run cucumber -q --dry-run features/unicode.feature
+    Then it should pass with
+      """
+      Feature: Featuring unicode
+
+        Scenario: So what, whatever
+          Given passing
+            | Brüno | abc |
+            | Bruno | æøå |
+
+      1 scenario (1 undefined)
+      1 step (1 undefined)
+
+      """
+    

data/features/work_in_progress.feature

@@ -62,6 +62,9 @@ Feature: Cucumber --work-in-progress switch
             I fail (RuntimeError)
             ./features/step_definitions/steps.rb:2:in `/^a failing step$/'
             features/wip.feature:4:in `Given a failing step'
+      
+      Failing Scenarios:
+      cucumber features/wip.feature:3 # Scenario: Failing
 
       1 scenario (1 failed)
       1 step (1 failed)

data/gem_tasks/sass.rake

@@ -0,0 +1,4 @@
+desc 'Generate the css for the html formatter from sass'
+task :sass do
+  sh 'sass -t expanded lib/cucumber/formatter/cucumber.sass > lib/cucumber/formatter/cucumber.css'
+end

data/lib/cucumber.rb

@@ -9,60 +9,3 @@ require 'cucumber/step_mother'
 require 'cucumber/cli/main'
 require 'cucumber/broadcaster'
 require 'cucumber/core_ext/exception'
-
-module Cucumber
-  KEYWORD_KEYS = %w{name native encoding feature background scenario scenario_outline examples given when then but}
-  
-  class << self
-    # The currently active language
-    attr_reader :lang
-    
-    def load_language(lang) #:nodoc:
-      return if @lang
-      @lang = lang
-      alias_step_definitions(lang)
-      Parser.load_parser(keyword_hash)
-    end
-
-    def language_incomplete?(lang=@lang)
-      KEYWORD_KEYS.detect{|key| keyword_hash(lang)[key].nil?}
-    end
-
-    # File mode that accounts for Ruby platform and current language
-    def file_mode(m)
-      Cucumber::RUBY_1_9 ? "#{m}:#{keyword_hash['encoding']}" : m
-    end
-
-    # Returns a Hash of the currently active
-    # language, or for a specific language if +lang+ is
-    # specified.
-    def keyword_hash(lang=@lang)
-      LANGUAGES[lang]
-    end
-
-    def scenario_keyword
-      keyword_hash['scenario'].split('|')[0] + ':'
-    end
-    
-    def alias_step_definitions(lang) #:nodoc:
-      keywords = %w{given when then and but}.map{|keyword| keyword_hash(lang)[keyword].split('|')}
-      alias_steps(keywords.flatten)
-    end
-    
-    # Sets up additional method aliases for Given, When and Then.
-    # This does *not* affect how feature files are parsed. If you
-    # want to create aliases in the parser, you have to do this in
-    # languages.yml. For example:
-    #
-    # and: And|With
-    def alias_steps(keywords)
-      keywords.each do |adverb|
-        StepMother.alias_adverb(adverb)
-        World.alias_adverb(adverb)
-      end
-    end
-  end  
-
-  # Make sure we always have English aliases
-  alias_step_definitions('en')
-end

data/lib/cucumber/ast/comment.rb

@@ -17,7 +17,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        @value.split("\n").each do |line|
+        @value.strip.split("\n").each do |line|
           visitor.visit_comment_line(line.strip)
         end
       end

data/lib/cucumber/ast/feature.rb

@@ -2,12 +2,12 @@ module Cucumber
   module Ast
     # Represents the root node of a parsed feature.
     class Feature
-      attr_accessor :file
+      attr_accessor :file, :language
       attr_writer :features
       attr_reader :name
 
       def initialize(background, comment, tags, name, feature_elements)
-        @background, @comment, @tags, @name, @feature_elements = background, comment, tags, name, feature_elements
+        @background, @comment, @tags, @name, @feature_elements = background, comment, tags, name.strip, feature_elements
 
         background.feature = self if background
         @feature_elements.each do |feature_element|

data/lib/cucumber/ast/feature_element.rb

@@ -49,5 +49,9 @@ module Cucumber
     def accept_hook?(hook)
       @tags.accept_hook?(hook) || @feature.accept_hook?(hook)
     end
+    
+    def language
+      @feature.language
+    end
   end
 end

data/lib/cucumber/ast/outline_table.rb

@@ -44,7 +44,8 @@ module Cucumber
       end
 
       class ExampleRow < Cells
-        
+        attr_reader :scenario_outline # https://rspec.lighthouseapp.com/projects/16211/tickets/342
+
         def create_step_invocations!(scenario_outline)
           @scenario_outline = scenario_outline
           @step_invocations = scenario_outline.step_invocations(self)

data/lib/cucumber/ast/py_string.rb

@@ -17,7 +17,6 @@ module Cucumber
     # Note how the indentation from the source is stripped away.
     #
     class PyString
-
       def self.default_arg_name
         "string"
       end

data/lib/cucumber/ast/scenario.rb

@@ -25,12 +25,14 @@ module Cucumber
         visitor.visit_tags(@tags)
         visitor.visit_scenario_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
 
-        skip = @background && @background.failed?
-        skip_invoke! if skip
-        visitor.step_mother.before_and_after(self, skip) do
+        background_failed = @background && @background.failed?
+        skip_invoke! if background_failed
+        skip_hooks = background_failed || @executed
+        visitor.step_mother.before_and_after(self, skip_hooks) do
           visitor.visit_steps(@steps)
         end
         visitor.visit_exception(@exception, :failed) if @exception
+        @executed = true
       end
 
       # Returns true if one or more steps failed

data/lib/cucumber/ast/scenario_outline.rb

@@ -69,7 +69,12 @@ module Cucumber
       end
 
       def visit_scenario_name(visitor, row)
-        visitor.visit_scenario_name(Cucumber.scenario_keyword, row.name, file_colon_line(row.line), source_indent(first_line_length))
+        visitor.visit_scenario_name(
+          @feature.language.scenario_keyword,
+          row.name, 
+          file_colon_line(row.line), 
+          source_indent(first_line_length)
+        )
       end
 
       def to_sexp

data/lib/cucumber/ast/step.rb

@@ -74,6 +74,10 @@ module Cucumber
         @file_colon_line ||= @feature_element.file_colon_line(@line) unless @feature_element.nil?
       end
 
+      def language
+        @feature_element.language
+      end
+
       def dom_id
         @dom_id ||= file_colon_line.gsub(/\//, '_').gsub(/\./, '_').gsub(/:/, '_')
       end
@@ -81,8 +85,11 @@ module Cucumber
       private
 
       def matched_cells(cells)
+        col_index = 0
         cells.select do |cell|
-          delimited = delimited(cell.header_cell.value)
+          header_cell = cell.table.header_cell(col_index)
+          col_index += 1
+          delimited = delimited(header_cell.value)
           @name.index(delimited) || (@multiline_arg && @multiline_arg.has_text?(delimited))
         end
       end