kosmas58-cucumber 0.1.99.23 → 0.1.100.5

data/examples/tickets/features/241.feature

@@ -0,0 +1,13 @@
+Users want to use cucumber, so tests are necessary to verify
+it is all working as expected
+
+Feature: Using the Console Formatter
+  In order to verify this error
+  I want to run this feature using the progress format
+  So that it can be fixed
+  
+  Scenario: A normal feature
+    Given I have a pending step
+    When  I run this feature with the progress format
+    Then  I should get a no method error for 'backtrace_line'
+

data/examples/tickets/features/step_definitons/tickets_steps.rb

@@ -5,9 +5,6 @@ World do
 end
 
 After do |scenario|
-  if scenario.status.index(:failed)
-    # Call the BDD police
-  end
 end
 
 Given "be_empty" do
@@ -53,8 +50,24 @@ Then /^I should be (\w+) in (\w+)$/ do |key, value|
   hash[key].should == value
 end
 
-Then /^I shoule see a multiline string like$/ do |s|
+Then /^I should see a multiline string like$/ do |s|
   s.should == %{A string
 that spans
 several lines}
 end
+
+Given /^the following users exist in the system$/ do |table|
+  table.hashes[0][:role_assignments].should == 'HUMAN RESOURCE'
+end
+
+Given /^I have a pending step$/ do
+  pending
+end
+
+When /^I run this feature with the progress format$/ do
+  pending
+end
+
+Then /^I should get a no method error for 'backtrace_line'$/ do
+  pending
+end

data/examples/tickets/features/tickets.feature

@@ -20,7 +20,7 @@ Feature: Cucumber
       | Oslo  | London  |
     Then I should be working in London
     And I should be born in Oslo
-    And I shoule see a multiline string like
+    And I should see a multiline string like
       """
       A string
       that spans

data/features/background.feature

@@ -16,7 +16,7 @@ Feature: backgrounds
         Then I should have '10' cukes
 
     1 scenario
-    2 passed steps
+    3 passed steps
     
     """
   
@@ -64,7 +64,7 @@ Feature: backgrounds
         | 10    |
 
     2 scenarios
-    4 passed steps
+    5 passed steps
 
     """
 
@@ -80,6 +80,7 @@ Feature: backgrounds
           ./features/step_definitions/sample_steps.rb:2:in `flunker'
           ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
           features/background/failing_background.feature:4:in `Given failing without a table'
+        And '10' cukes
 
       Scenario: failing background
         Then I should have '10' cukes
@@ -88,8 +89,8 @@ Feature: backgrounds
         Then I should have '10' cukes
 
     2 scenarios
-    2 failed steps
-    2 skipped steps
+    1 failed step
+    5 skipped steps
 
     """
 
@@ -121,8 +122,8 @@ Feature: backgrounds
         | 10    |
 
     2 scenarios
-    2 failed steps
-    2 skipped steps
+    1 failed step
+    4 skipped steps
 
     """
 
@@ -160,15 +161,12 @@ Feature: backgrounds
       Scenario: passing background
         Then I should have '10' global cukes
 
-      Background: 
-        Given passing without a table
+      Scenario: failing background
         And '10' global cukes
           FAIL (RuntimeError)
           ./features/step_definitions/sample_steps.rb:2:in `flunker'
           ./features/step_definitions/sample_steps.rb:37:in `/^'(.+)' global cukes$/'
-          features/background/failing_background_after_success.feature:3:in `And '10' global cukes'
-
-      Scenario: failing background
+          features/background/failing_background_after_success.feature:5:in `And '10' global cukes'
         Then I should have '10' global cukes
 
     2 scenarios

data/features/cucumber_cli.feature

@@ -32,7 +32,7 @@ Feature: Cucumber command line
             features/sample.feature:6:in `Given missing'
 
       1 scenario
-      1 failed step
+      1 undefined step
 
       """
 
@@ -337,6 +337,29 @@ Feature: Cucumber command line
 
       """
 
+  Scenario: Run with a negative tag
+    When I run cucumber -q features/sample.feature --dry-run -t ~four
+    Then it should pass with
+      """
+      @one
+      Feature: Sample
+
+        @two @three
+        Scenario: Missing
+          Given missing
+
+        @three
+        Scenario: Passing
+          Given passing
+            | a | b |
+            | c | d |
+
+      2 scenarios
+      1 skipped step
+      1 undefined step
+
+      """
+
   Scenario: Reformat files with --autoformat
     When I run cucumber --autoformat tmp/formatted features
     Then examples/self_test/tmp/formatted/features/sample.feature should contain

data/features/cucumber_cli_outlines.feature

@@ -17,10 +17,10 @@ Feature: Cucumber command line
           | missing | passing     |
           | passing | passing     |
           | failing | passing     |
-            FAIL (RuntimeError)
-            ./features/step_definitions/sample_steps.rb:2:in `flunker'
-            ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
-            features/outline_sample.feature:12:in `Given failing without a table'
+          FAIL (RuntimeError)
+          ./features/step_definitions/sample_steps.rb:2:in `flunker'
+          ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
+          features/outline_sample.feature:6:in `Given <state> without a table'
 
         Examples: Only passing
           | state   | other_state |
@@ -34,8 +34,6 @@ Feature: Cucumber command line
 
       """
 
-  # The "Only Passing" should not be printed
-  @buggy
   Scenario: Run single failing scenario outline table row
     When I run cucumber features/outline_sample.feature:12
     Then it should fail with
@@ -49,13 +47,10 @@ Feature: Cucumber command line
         Examples: Rainbow colours
           | state   | other_state |
           | failing | passing     |
-            FAIL (RuntimeError)
-            ./features/step_definitions/sample_steps.rb:2:in `flunker'
-            ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
-            features/outline_sample.feature:12:in `Given failing without a table'
-
-        Examples: Only passing
-          | state   | other_state |
+          FAIL (RuntimeError)
+          ./features/step_definitions/sample_steps.rb:2:in `flunker'
+          ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
+          features/outline_sample.feature:6:in `Given <state> without a table'
 
       1 scenario
       1 failed step
@@ -67,18 +62,14 @@ Feature: Cucumber command line
     When I run cucumber -q --format progress features/outline_sample.feature
     Then it should fail with
       """
-      UUS..FS..
-
-      (::) undefined scenarios (::)
-
-      features/outline_sample.feature:3:in `Scenario: I have no steps'
+      ----U-..F---..
 
       (::) failed steps (::)
 
       FAIL (RuntimeError)
       ./features/step_definitions/sample_steps.rb:2:in `flunker'
       ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
-      features/outline_sample.feature:12:in `Given failing without a table'
+      features/outline_sample.feature:6:in `Given <state> without a table'
 
       5 scenarios
       1 failed step

data/features/report_called_undefined_steps.feature

@@ -12,11 +12,13 @@ Feature: Cucumber command line
           Given a step definition that calls an undefined step # features/step_definitions/sample_steps.rb:19
             Undefined step: "this does not exist" (Cucumber::Undefined)
             ./features/step_definitions/sample_steps.rb:20:in `/^a step definition that calls an undefined step$/'
+            features/call_undefined_step_from_step_def.feature:4:in `Given a step definition that calls an undefined step'
 
         Scenario: Call via another                                         # features/call_undefined_step_from_step_def.feature:6
           Given call step "a step definition that calls an undefined step" # features/step_definitions/sample_steps.rb:23
             Undefined step: "this does not exist" (Cucumber::Undefined)
             ./features/step_definitions/sample_steps.rb:20:in `/^a step definition that calls an undefined step$/'
+            features/call_undefined_step_from_step_def.feature:7:in `Given call step "a step definition that calls an undefined step"'
 
       2 scenarios
       2 undefined steps

data/gem_tasks/rspec.rake

@@ -32,7 +32,8 @@ if require_spec
     t.spec_opts = ['--options', "spec/spec.opts"]
     t.spec_files = FileList['spec/**/*_spec.rb']
     t.fail_on_error = false
-    t.rcov = true
-    t.rcov_opts = ['--exclude', 'spec']  
+    #t.rcov = true
+    t.rcov = ENV['RCOV']
+    t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
   end
 end

data/lib/cucumber.rb

@@ -44,24 +44,16 @@ module Cucumber
       alias_steps(keywords)
     end
     
-    # Sets up additional aliases for Given, When and Then.
-    # Try adding the following to your <tt>support/env.rb</tt>:
-    #
-    #   # Given When Then in Norwegian
-    #   Cucumber.alias_steps %w{Gitt Naar Saa}
-    #
-    # You cannot use special characters here, because methods
-    # with special characters is not valid Ruby code
+    # 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.class_eval do
-          alias_method adverb, :register_step_definition
-        end
-
-        StepMother::WorldMethods.class_eval do
-          alias_method adverb, :__cucumber_invoke
-        end
+        StepMother.alias_adverb(adverb)
+        World.alias_adverb(adverb)
       end
     end
   end  

data/lib/cucumber/ast.rb

@@ -2,17 +2,17 @@ require 'cucumber/ast/comment'
 require 'cucumber/ast/tags'
 require 'cucumber/ast/features'
 require 'cucumber/ast/feature'
+require 'cucumber/ast/background'
 require 'cucumber/ast/scenario'
 require 'cucumber/ast/scenario_outline'
-require 'cucumber/ast/background'
-require 'cucumber/ast/steps'
+require 'cucumber/ast/step_invocation'
+require 'cucumber/ast/step_collection'
 require 'cucumber/ast/step'
 require 'cucumber/ast/table'
 require 'cucumber/ast/py_string'
 require 'cucumber/ast/outline_table'
 require 'cucumber/ast/examples'
 require 'cucumber/ast/visitor'
-require 'cucumber/ast/filter'
 
 module Cucumber
   # Classes in this module represent the Abstract Syntax Tree (AST)

data/lib/cucumber/ast/background.rb

@@ -1,88 +1,50 @@
+require 'cucumber/ast/feature_element'
+
 module Cucumber
   module Ast
-    class Background < Scenario
-
-      attr_accessor :world
-      attr_reader :status
+    class Background
+      include FeatureElement
+      attr_writer :feature
 
       def initialize(comment, line, keyword, steps)
-        @record_executed_steps = true
-        super(comment, Tags.new(1, []), line, keyword, "", steps)
+        @comment, @line, @keyword, @steps = comment, line, keyword, StepCollection.new(steps)
+        attach_steps(steps)
+        @step_invocations = @steps.step_invocations(true)
       end
 
-      def accept(visitor)
-        @world = visitor.new_world
-        if already_visited_steps?
-          @status = execute_steps(visitor)
+      def step_collection(step_invocations)
+        unless(@first_collection_created)
+          @first_collection_created = true
+          @step_invocations.dup(step_invocations)
         else
-          @status = visit_background_and_steps(visitor, @steps)
-          @steps_visited = true
+          @steps.step_invocations(true).dup(step_invocations)
         end
       end
 
-      def step_executed(step)
-        @feature.step_executed(step) if @feature && @record_executed_steps
+      def accept(visitor)
+        visitor.visit_comment(@comment)
+        visitor.visit_background_name(@keyword, "", file_colon_line(@line), source_indent(text_length))
+        visitor.step_mother.before_and_after(self)
+        visitor.visit_steps(@step_invocations)
+        @failed = @step_invocations.detect{|step_invocation| step_invocation.exception}
+      end
+
+      def failed?
+        @failed
       end
 
-      def already_visited_steps?
-        @steps_visited
+      def text_length
+        @keyword.jlength
       end
 
-      def to_sexp #:nodoc:
+      def to_sexp
         sexp = [:background, @line, @keyword]
         comment = @comment.to_sexp
         sexp += [comment] if comment
-        tags = @tags.to_sexp
-        sexp += tags if tags.any?
-        steps = @steps.map{|step| step.to_sexp}
+        steps = @steps.to_sexp
         sexp += steps if steps.any?
         sexp
       end
-      
-      private
-
-      def visit_background_and_steps(visitor, steps)
-        visitor.visit_comment(@comment)
-        visitor.visit_scenario_name(@keyword, @name, file_line(@line), source_indent(text_length))
-
-        previous = :passed
-        steps.each do |step|
-          step.previous = previous
-          step.world    = @world
-          visitor.visit_step(step)
-          previous = step.status
-        end
-        previous
-      end
-      
-      def execute_steps(visitor)
-        previous = :passed
-        executed_steps = []
-        exception = nil
-        @steps.each do |step|
-          executed_step, previous, _ = step.execute_as_new(@world, previous, visitor, @line)
-          executed_steps << executed_step
-          exception ||= executed_step.exception
-        end
-        @steps = executed_steps
-        
-        if exception && @status != :failed
-          without_recording_steps do
-            @steps_visited = false
-            #Since the steps have already been executed they will not be re-run, they will just be displayed
-            visitor.visit_background(self)
-          end 
-        end
-
-        previous
-      end
-
-      def without_recording_steps
-        @record_executed_steps = false
-        yield
-        @record_executed_steps = true
-      end
-
     end
   end
-end
+end

data/lib/cucumber/ast/examples.rb

@@ -10,12 +10,24 @@ module Cucumber
         visitor.visit_outline_table(@outline_table)
       end
 
+      def descend?(visitor)
+        @outline_table.descend?(visitor)
+      end
+
+      def skip_invoke!
+        @outline_table.skip_invoke!
+      end
+
+      def matches_scenario_names?(scenario_names)
+        scenario_names.detect{|name| name == @name}
+      end
+
       def each_example_row(&proc)
-        @outline_table.each_cells_row(&proc)
+        @outline_table.cells_rows[1..-1].each(&proc)
       end
 
-      def at_lines?(lines)
-        lines.empty? || lines.index(@line) || @outline_table.at_lines?(lines)
+      def matches_lines?(lines)
+        lines.index(@line) || @outline_table.matches_lines?(lines)
       end
 
       def to_sexp