kosmas58-cucumber 0.2.2.1 → 0.2.3.3

data/examples/tickets/features/270/back.steps.rb

@@ -0,0 +1,14 @@
+require 'spec/expectations'
+
+Given /^plop$/ do
+  raise "Only one plop!" if @plop
+  @plop = true
+end
+ 
+When /^I barp$/ do
+  @plop.should == true
+end
+ 
+When /^I wibble$/ do
+  @plop.should == true
+end

data/examples/tickets/features/step_definitons/246_steps.rb

@@ -0,0 +1,3 @@
+Given /^no ([a-z]+(?: [a-z]+)*) exists in the system$/ do |resource|
+  resource.should == "public holiday"
+end

data/features/background.feature

@@ -16,7 +16,7 @@ Feature: backgrounds
         Then I should have '10' cukes
 
     1 scenario
-    3 passed steps
+    2 passed steps
     
     """
   
@@ -64,7 +64,7 @@ Feature: backgrounds
         | 10    |
 
     2 scenarios
-    5 passed steps
+    4 passed steps
 
     """
 
@@ -123,7 +123,7 @@ Feature: backgrounds
 
     2 scenarios
     1 failed step
-    4 skipped steps
+    3 skipped steps
 
     """
 
@@ -217,5 +217,22 @@ Feature: backgrounds
     
     """
 
-  #@josephwilk
+  Scenario: background with name
+    When I run cucumber -q features/background/background_with_name.feature --require features
+    Then it should pass with
+    """
+    Feature: background with name
+
+      Background: I'm a background and I'm ok
+        Given '10' cukes
+
+      Scenario: example
+        Then I should have '10' cukes
+
+    1 scenario
+    2 passed steps
+    
+    """
+
+  @josephwilk
   Scenario: run a scenario showing explicit background steps --explicit-background

data/features/cucumber_cli.feature

@@ -229,15 +229,28 @@ Feature: Cucumber command line
             hello
             \"\"\"
 
-      12 scenarios
+      Feature: undefined multiline args
+      
+        Scenario: pystring
+          Given a pystring
+            \"\"\"
+              example
+            \"\"\"
+      
+        Scenario: table
+          Given a table
+            | table   |
+            | example |
+
+      14 scenarios
       12 skipped steps
-      7 undefined steps
+      9 undefined steps
 
       """
 
   Scenario: Multiple formatters and outputs
     When I run cucumber --format progress --out tmp/progress.txt --format pretty --out tmp/pretty.txt  --dry-run features/lots_of_undefined.feature
-    And examples/self_test/tmp/progress.txt should contain
+    And "examples/self_test/tmp/progress.txt" should contain
       """
       UUUUU
 
@@ -245,7 +258,7 @@ Feature: Cucumber command line
       5 undefined steps
 
       """
-    And examples/self_test/tmp/pretty.txt should match
+    And "examples/self_test/tmp/pretty.txt" should match
       """
       Feature: Lots of undefined
 
@@ -362,7 +375,7 @@ Feature: Cucumber command line
 
   Scenario: Reformat files with --autoformat
     When I run cucumber --autoformat tmp/formatted features
-    Then examples/self_test/tmp/formatted/features/sample.feature should contain
+    Then "examples/self_test/tmp/formatted/features/sample.feature" should contain
       """
       @one
       Feature: Sample

data/features/cucumber_cli_outlines.feature

@@ -41,7 +41,7 @@ Feature: Cucumber command line
       Feature: Outline Sample
 
         Scenario Outline: Test state          # features/outline_sample.feature:5
-          Given <state> without a table       # features/step_definitions/sample_steps.rb:12
+          Given <state> without a table       # features/step_definitions/sample_steps.rb:15
           Given <other_state> without a table # features/step_definitions/sample_steps.rb:12
 
         Examples: Rainbow colours
@@ -58,11 +58,14 @@ Feature: Cucumber command line
 
       """
 
+  # There are 10 characters in the progress, but only 8 reported steps. Needs investigation.
+  # Looks like we're outputting too many characters.
+  @buggy
   Scenario: Run all with progress formatter
     When I run cucumber -q --format progress features/outline_sample.feature
     Then it should fail with
       """
-      ----U-..F---..
+      --U-..F-..
 
       (::) failed steps (::)
 

data/features/snippet.feature

@@ -0,0 +1,23 @@
+Feature: Snippets
+  In order to help speed up writing step definitions
+  As a feature editor
+  I want snippet suggestions for undefined step definitions
+
+  Scenario: Snippet for undefined step with a pystring
+    When I run cucumber features/undefined_multiline_args.feature:3 -n
+    Then the output should contain
+      """
+      Given /^a pystring$/ do |string|
+        # string is a Cucumber::Ast::PyString
+        pending
+      end
+      """
+  Scenario: Snippet for undefined step with a step table
+    When I run cucumber features/undefined_multiline_args.feature:9 -n
+    Then the output should contain
+      """
+      Given /^a table$/ do |table|
+        # table is a Cucumber::Ast::Table
+        pending
+      end
+      """

data/features/step_definitions/cucumber_steps.rb

@@ -21,10 +21,14 @@ Then /^it should (fail|pass) with$/ do |success, output|
   end
 end
 
-Then /^(.*) should contain$/ do |file, text|
+Then /^the output should contain$/ do |text|
+  @out.should include(text)
+end
+
+Then /^"(.*)" should contain$/ do |file, text|
   IO.read(file).should == text
 end
 
-Then /^(.*) should match$/ do |file, text|
+Then /^"(.*)" should match$/ do |file, text|
   IO.read(file).should =~ Regexp.new(text)
 end

data/features/usage.feature

@@ -19,6 +19,7 @@ Feature: Cucumber command line
       /^call step "(.*)"$/                                              # features/step_definitions/sample_steps.rb:23
        Given call step "a step definition that calls an undefined step" # features/call_undefined_step_from_step_def.feature:7
       /^'(.+)' cukes$/   # features/step_definitions/sample_steps.rb:27
+       Given '10' cukes  # features/background/background_with_name.feature:4
        And '10' cukes    # features/background/failing_background.feature:5
        Given '10' cukes  # features/background/passing_background.feature:4
        Given '10' cukes  # features/background/scenario_outline_passing_background.feature:4
@@ -72,6 +73,7 @@ Feature: Cucumber command line
        Given '2' cukes   # features/tons_of_cukes.feature:51
        Given '2' cukes   # features/tons_of_cukes.feature:52
       /^I should have '(.+)' cukes$/      # features/step_definitions/sample_steps.rb:31
+       Then I should have '10' cukes      # features/background/background_with_name.feature:7
        Then I should have '10' cukes      # features/background/failing_background.feature:8
        Then I should have '10' cukes      # features/background/failing_background.feature:11
        Then I should have '10' cukes      # features/background/passing_background.feature:7
@@ -103,6 +105,9 @@ Feature: Cucumber command line
        Given failing expectation # features/failing_expectation.feature:4
       /^failing$/    # features/step_definitions/sample_steps.rb:8
        Given failing # features/sample.feature:16
+      (::) UNUSED (::)
+      /^unused$/          # features/step_definitions/sample_steps.rb:66
+      /^another unused$/  # features/step_definitions/sample_steps.rb:69
 
       """
 

data/gem_tasks/rspec.rake

@@ -29,9 +29,10 @@ if require_spec
 
   desc "Run the Cucumber specs"
   Spec::Rake::SpecTask.new do |t|
-    t.spec_opts = ['--options', "spec/spec.opts"]
-    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ['--options', "specs/spec.opts"]
+    t.spec_files = FileList['specs/**/*_spec.rb']
     t.rcov = ENV['RCOV']
     t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
+    t.verbose = true
   end
 end

data/lib/cucumber/ast/background.rb

@@ -6,8 +6,8 @@ module Cucumber
       include FeatureElement
       attr_writer :feature
 
-      def initialize(comment, line, keyword, steps)
-        @comment, @line, @keyword, @steps = comment, line, keyword, StepCollection.new(steps)
+      def initialize(comment, line, keyword, name, steps)
+        @comment, @line, @keyword, @name, @steps = comment, line, keyword, name, StepCollection.new(steps)
         attach_steps(steps)
         @step_invocations = @steps.step_invocations(true)
       end
@@ -23,7 +23,7 @@ module Cucumber
 
       def accept(visitor)
         visitor.visit_comment(@comment)
-        visitor.visit_background_name(@keyword, "", file_colon_line(@line), source_indent(text_length))
+        visitor.visit_background_name(@keyword, @name, 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}

data/lib/cucumber/ast/examples.rb

@@ -10,26 +10,14 @@ 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.cells_rows[1..-1].each(&proc)
       end
 
-      def matches_lines?(lines)
-        lines.index(@line) || @outline_table.matches_lines?(lines)
-      end
-
       def to_sexp
         [:examples, @keyword, @name, @outline_table.to_sexp]
       end

data/lib/cucumber/ast/feature.rb

@@ -3,11 +3,10 @@ module Cucumber
     # Represents the root node of a parsed feature.
     class Feature
       attr_accessor :file
-      attr_writer :features, :lines
+      attr_writer :features
 
       def initialize(background, comment, tags, name, feature_elements)
         @background, @comment, @tags, @name, @feature_elements = background, comment, tags, name, feature_elements
-        @lines = []
 
         @feature_elements.each do |feature_element|
           feature_element.feature = self
@@ -15,24 +14,15 @@ module Cucumber
       end
 
       def accept(visitor)
-        visitor.current_feature_lines = @lines
         visitor.visit_comment(@comment)
         visitor.visit_tags(@tags)
         visitor.visit_feature_name(@name)
         visitor.visit_background(@background) if @background
         @feature_elements.each do |feature_element|
-          visitor.visit_feature_element(feature_element) if feature_element.descend?(visitor)
+          visitor.visit_feature_element(feature_element)
         end
       end
 
-      def descend?(visitor)
-        @feature_elements.detect{ |feature_element| feature_element.descend?(visitor) }
-      end
-
-      def has_tags?(tags)
-        @tags.has_tags?(tags)
-      end
-
       def next_feature_element(feature_element, &proc)
         index = @feature_elements.index(feature_element)
         next_one = @feature_elements[index+1]

data/lib/cucumber/ast/feature_element.rb

@@ -12,14 +12,6 @@ module Cucumber
       @keyword.jlength + @name.jlength
     end
 
-    def matches_lines?(lines)
-      lines.index(@line) || @steps.matches_lines?(lines) || @tags.matches_lines?(lines)
-    end
-
-    def has_tags?(tags)
-      @tags.has_tags?(tags) || @feature.has_tags?(tags)
-    end
-
     def matches_scenario_names?(scenario_names)
       scenario_names.detect{|name| name == @name}
     end

data/lib/cucumber/ast/features.rb

@@ -18,7 +18,7 @@ module Cucumber
 
       def accept(visitor)
         @features.each do |feature|
-          visitor.visit_feature(feature) if feature.descend?(visitor)
+          visitor.visit_feature(feature)
         end
       end
     end

data/lib/cucumber/ast/outline_table.rb

@@ -5,45 +5,37 @@ module Cucumber
         super(raw)
         @scenario_outline = scenario_outline
         @cells_class = ExampleCells
-        
-        cells_rows.each do |cells|
-          cells.create_step_invocations!(scenario_outline)
-        end
+        create_step_invocations_for_example_rows!(scenario_outline)
       end
 
       def accept(visitor)
         cells_rows.each_with_index do |row, n|
-          if n == 0 || matches?(visitor, row)
-            visitor.visit_table_row(row)
-          end
+          visitor.visit_table_row(row)
         end
         nil
       end
 
-      def descend?(visitor)
-        cells_rows.detect{|cells_row| cells_row.descend?(visitor)}
-      end
-      
-      def matches?(visitor, cells)
-        @scenario_outline.matches_tags_and_name?(visitor) &&
-        (visitor.matches_lines?(cells) || visitor.matches_lines?(@scenario_outline))
-      end
-      
       def skip_invoke!
-        cells_rows.each do |cells|
+        example_rows.each do |cells|
           cells.skip_invoke!
         end
       end
 
+      def create_step_invocations_for_example_rows!(scenario_outline)
+        example_rows.each do |cells|
+          cells.create_step_invocations!(scenario_outline)
+        end
+      end
+      
+      def example_rows
+        cells_rows[1..-1]
+      end
+
       class ExampleCells < Cells
         def create_step_invocations!(scenario_outline)
           @step_invocations = scenario_outline.step_invocations(self)
         end
         
-        def descend?(visitor)
-          @table.matches?(visitor, self)
-        end
-
         def skip_invoke!
           @step_invocations.each do |step_invocation|
             step_invocation.skip_invoke!
@@ -53,7 +45,7 @@ module Cucumber
         def accept(visitor)
           if header?
             @cells.each do |cell|
-              cell.status = :skipped
+              cell.status = :skipped_param
               visitor.visit_table_cell(cell)
             end
           else

data/lib/cucumber/ast/py_string.rb

@@ -17,26 +17,22 @@ module Cucumber
     # Note how the indentation from the source is stripped away.
     #
     class PyString
+
+      def self.default_arg_name
+        "string"
+      end
+
       def initialize(start_line, end_line, string, quotes_indent)
         @start_line, @end_line = start_line, end_line
         @string, @quotes_indent = string.gsub(/\\"/, '"'), quotes_indent
-        @status = :passed
-      end
-
-      def status=(status)
-        @status = status
       end
 
       def to_s
         @string.indent(-@quotes_indent)
       end
 
-      def matches_lines?(lines)
-        lines.detect{|l| l >= @start_line && l <= @end_line}
-      end
-
       def accept(visitor)
-        visitor.visit_py_string(to_s, @status)
+        visitor.visit_py_string(to_s)
       end
       
       def arguments_replaced(arguments) #:nodoc:
@@ -52,7 +48,6 @@ module Cucumber
       def to_sexp #:nodoc:
         [:py_string, to_s]
       end
-    
     end
   end
 end

data/lib/cucumber/ast/scenario.rb

@@ -8,7 +8,7 @@ module Cucumber
       def initialize(background, comment, tags, line, keyword, name, steps)
         @background, @comment, @tags, @line, @keyword, @name = background, comment, tags, line, keyword, name
         attach_steps(steps)
-        
+
         step_invocations = steps.map{|step| step.step_invocation}
         if @background
           @steps = @background.step_collection(step_invocations)
@@ -22,13 +22,6 @@ module Cucumber
         @background.feature = feature if @background
       end
 
-      def descend?(visitor)
-        visitor.matches_lines?(self) &&
-        visitor.included_by_tags?(self) &&
-        !visitor.excluded_by_tags?(self) &&
-        visitor.matches_scenario_names?(self)
-      end
-
       def accept(visitor)
         visitor.visit_comment(@comment)
         visitor.visit_tags(@tags)

data/lib/cucumber/ast/scenario_outline.rb

@@ -30,16 +30,6 @@ module Cucumber
         @background.feature = feature if @background
       end
 
-      def descend?(visitor)
-        @examples_array.detect { |examples| examples.descend?(visitor) }
-      end
-
-      def matches_tags_and_name?(visitor)
-        visitor.included_by_tags?(self) &&
-        !visitor.excluded_by_tags?(self) &&
-        visitor.matches_scenario_names?(self)
-      end
-
       def accept(visitor)
         visitor.visit_comment(@comment)
         visitor.visit_tags(@tags)
@@ -48,7 +38,7 @@ module Cucumber
 
         skip_invoke! if @background && @background.failed?
         @examples_array.each do |examples|
-          visitor.visit_examples(examples) if examples.descend?(visitor)
+          visitor.visit_examples(examples)
         end
       end
 

data/lib/cucumber/ast/step.rb

@@ -33,13 +33,11 @@ module Cucumber
       def accept(visitor)
         # The only time a Step is visited is when it is in a ScenarioOutline.
         # Otherwise it's always StepInvocation that gest visited instead.
-        visit_step_details(visitor, first_match(visitor), @multiline_arg, :skipped, nil, nil)
+        visit_step_result(visitor, first_match(visitor), @multiline_arg, :skipped, nil, nil)
       end
       
-      def visit_step_details(visitor, step_match, multiline_arg, status, exception, background)
-        visitor.visit_step_name(@keyword, step_match, status, source_indent, background)
-        visitor.visit_multiline_arg(@multiline_arg) if @multiline_arg
-        visitor.visit_exception(exception, status) if exception
+      def visit_step_result(visitor, step_match, multiline_arg, status, exception, background)
+        visitor.visit_step_result(@keyword, step_match, @multiline_arg, status, exception, source_indent, background)
       end
 
       def first_match(visitor)
@@ -58,10 +56,6 @@ module Cucumber
         [:step, @line, @keyword, @name, (@multiline_arg.nil? ? nil : @multiline_arg.to_sexp)].compact
       end
 
-      def matches_lines?(lines)
-        lines.index(@line) || (@multiline_arg && @multiline_arg.matches_lines?(lines))
-      end
-
       def source_indent
         @feature_element.source_indent(text_length)
       end

data/lib/cucumber/ast/step_collection.rb

@@ -41,10 +41,6 @@ module Cucumber
         @steps[i-1]
       end
 
-      def matches_lines?(lines)
-        @steps.detect {|step| step.matches_lines?(lines)}
-      end
-
       def empty?
         @steps.empty?
       end

data/lib/cucumber/ast/step_invocation.rb

@@ -20,7 +20,7 @@ module Cucumber
 
       def accept(visitor)
         invoke(visitor.step_mother, visitor.options)
-        @step.visit_step_details(visitor, @step_match, @multiline_arg, @status, @exception, @background)
+        @step.visit_step_result(visitor, @step_match, @multiline_arg, @status, @exception, @background)
       end
 
       def invoke(step_mother, options)
@@ -68,7 +68,6 @@ module Cucumber
 
       def status!(status)
         @status = status
-        @multiline_arg.status = status if @multiline_arg
         @matched_cells.each do |cell|
           cell.status = status
         end
@@ -86,10 +85,6 @@ module Cucumber
         end
       end
 
-      def matches_lines?(lines)
-        @step.matches_lines?(lines)
-      end
-
       def text_length
         @step.text_length
       end
@@ -98,6 +93,10 @@ module Cucumber
         @step.keyword
       end
 
+      def multiline_arg
+        @step.multiline_arg
+      end
+
       def file_colon_line
         @step.file_colon_line
       end