cucumber 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,22 @@
+== 0.2.1 2009-03-25
+
+This release fixes a few minor bugs and adds a couple of new features.
+
+== Bugfixes
+* Fixed Cucumber, and rails controller error handling (#49 Matt Patterson)
+* HTML Formatter doesn't work correctly with scenario Outlines. (#260 Aslak Hellesøy)
+* After blocks are run in reverse order of registration. (#113 Aslak Hellesøy)
+* Snippets are showing 'Ands' (#249 Aslak Hellesøy)
+
+=== New features
+* Snippets use a regexp and block arguments if the step name has "quoted" arguments. (Aslak Hellesøy)
+* Cucumber::Ast::Feature#to_sexp includes the file name. (Aslak Hellesøy)
+* support/env.rb is not loaded when --dry-run is specified. This is to increase performance. (Aslak Hellesøy)
+* New usage formatter. This is the foundation for editor autocompletion and navigation between steps and step definitions. (#209 Aslak Hellesøy)
+
+=== Removed features
+* -S/--step-definitions option introduced in 0.2.0 is removed. Use --format usage [--dry-run] [--no-color].
+
 == 0.2.0 2009-03-18
 
 This release sports a bunch of new and exciting features, as well a major rewrite of Cucumber's internals. 

data/Manifest.txt

@@ -158,6 +158,7 @@ examples/self_test/features/sample.feature
 examples/self_test/features/step_definitions/sample_steps.rb
 examples/self_test/features/support/env.rb
 examples/self_test/features/support/tag_count_formatter.rb
+examples/self_test/features/tons_of_cukes.feature
 examples/sinatra/Rakefile
 examples/sinatra/app.rb
 examples/sinatra/features/add.feature
@@ -177,9 +178,11 @@ examples/tickets/features/177/3.feature
 examples/tickets/features/180.feature
 examples/tickets/features/236.feature
 examples/tickets/features/241.feature
+examples/tickets/features/248.feature
 examples/tickets/features/lib/eatting_machine.rb
 examples/tickets/features/lib/pantry.rb
 examples/tickets/features/scenario_outline.feature
+examples/tickets/features/step_definitons/248_steps.rb
 examples/tickets/features/step_definitons/scenario_outline_steps.rb
 examples/tickets/features/step_definitons/tickets_steps.rb
 examples/tickets/features/tickets.feature
@@ -197,13 +200,13 @@ features/report_called_undefined_steps.feature
 features/step_definitions/cucumber_steps.rb
 features/step_definitions/extra_steps.rb
 features/support/env.rb
+features/usage.feature
 gem_tasks/deployment.rake
 gem_tasks/environment.rake
 gem_tasks/features.rake
 gem_tasks/fix_cr_lf.rake
 gem_tasks/flog.rake
 gem_tasks/gemspec.rake
-gem_tasks/jar.rake
 gem_tasks/rspec.rake
 gem_tasks/yard.rake
 lib/autotest/cucumber.rb
@@ -250,6 +253,7 @@ lib/cucumber/formatter/profile.rb
 lib/cucumber/formatter/progress.rb
 lib/cucumber/formatter/rerun.rb
 lib/cucumber/formatter/unicode.rb
+lib/cucumber/formatter/usage.rb
 lib/cucumber/formatters/unicode.rb
 lib/cucumber/jbehave.rb
 lib/cucumber/languages.yml

data/examples/self_test/features/tons_of_cukes.feature

@@ -0,0 +1,52 @@
+@lots
+Feature: Tons of cukes
+  Scenario: Lots and lots
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes

data/examples/sinatra/features/support/env.rb

@@ -1,7 +1,11 @@
+# See http://wiki.github.com/aslakhellesoy/cucumber/sinatra
+# for more details about Sinatra with Cucumber
+
 # Sinatra
-require File.join(File.dirname(__FILE__), *%w[.. .. app])
+app_file = File.join(File.dirname(__FILE__), *%w[.. .. app.rb])
+require app_file
 # Force the application name because polyglot breaks the auto-detection logic.
-Sinatra::Application.app_file = File.join(File.dirname(__FILE__), *%w[.. .. app.rb])
+Sinatra::Application.app_file = app_file
 
 # RSpec
 require 'spec/expectations'

data/examples/tickets/features/248.feature

@@ -0,0 +1,11 @@
+Feature: pending method causes failure in Scenario Outlines 
+
+  Scenario Outline: blah
+    Given this is pending until we fix it
+    Given context with <Stuff>
+    When action
+    Then outcome with <Blah>
+
+  Examples:
+    | Stuff  | Blah        |
+    | Cheese | Pepper Jack |

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

@@ -0,0 +1,15 @@
+Given /^this is pending until we fix it$/ do
+  pending
+end
+
+Given /^context with Cheese$/ do
+  pending
+end
+
+When /^action$/ do
+  pending
+end
+
+Then /^outcome with Pepper Jack$/ do
+  pending
+end

data/features/cucumber_cli.feature

@@ -166,7 +166,7 @@ Feature: Cucumber command line
       """
 
   Scenario: --dry-run
-    When I run cucumber --dry-run --no-snippets features/*.feature
+    When I run cucumber --dry-run --no-snippets features/*.feature --tags ~@lots
     Then it should pass with
       """
       Feature: Calling undefined step

data/features/custom_formatter.feature

@@ -4,8 +4,8 @@ Feature: Custom Formatter
     When I run cucumber --format Tag::Count features
     Then it should fail with
       """
-      | four | one | three | two |
-      | 1    | 1   | 2     | 1   |
+      | four | lots | one | three | two |
+      | 1    | 1    | 1   | 2     | 1   |
 
       """
     

data/features/usage.feature

@@ -0,0 +1,108 @@
+Feature: Cucumber command line
+  In order to be able to write an editor plugin that can jump between
+  steps and step definitions, Cucumber must provide a way to
+  display how they are related.
+
+  Scenario: List usage of step definitions
+    When I run cucumber features --format usage --dry-run
+    Then it should pass with
+      """
+      /^passing without a table$/          # features/step_definitions/sample_steps.rb:12
+       Given passing without a table       # features/background/failing_background_after_success.feature:4
+       Given <state> without a table       # features/outline_sample.feature:6
+       Given <other_state> without a table # features/outline_sample.feature:7
+      /^failing without a table$/    # features/step_definitions/sample_steps.rb:15
+       Given failing without a table # features/background/failing_background.feature:4
+       Given failing without a table # features/background/scenario_outline_failing_background.feature:4
+      /^a step definition that calls an undefined step$/    # features/step_definitions/sample_steps.rb:19
+       Given a step definition that calls an undefined step # features/call_undefined_step_from_step_def.feature:4
+      /^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
+       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
+       Given '2' cukes   # features/tons_of_cukes.feature:4
+       Given '2' cukes   # features/tons_of_cukes.feature:5
+       Given '2' cukes   # features/tons_of_cukes.feature:6
+       Given '2' cukes   # features/tons_of_cukes.feature:7
+       Given '2' cukes   # features/tons_of_cukes.feature:8
+       Given '2' cukes   # features/tons_of_cukes.feature:9
+       Given '2' cukes   # features/tons_of_cukes.feature:10
+       Given '2' cukes   # features/tons_of_cukes.feature:11
+       Given '2' cukes   # features/tons_of_cukes.feature:12
+       Given '2' cukes   # features/tons_of_cukes.feature:13
+       Given '2' cukes   # features/tons_of_cukes.feature:14
+       Given '2' cukes   # features/tons_of_cukes.feature:15
+       Given '2' cukes   # features/tons_of_cukes.feature:16
+       Given '2' cukes   # features/tons_of_cukes.feature:17
+       Given '2' cukes   # features/tons_of_cukes.feature:18
+       Given '2' cukes   # features/tons_of_cukes.feature:19
+       Given '2' cukes   # features/tons_of_cukes.feature:20
+       Given '2' cukes   # features/tons_of_cukes.feature:21
+       Given '2' cukes   # features/tons_of_cukes.feature:22
+       Given '2' cukes   # features/tons_of_cukes.feature:23
+       Given '2' cukes   # features/tons_of_cukes.feature:24
+       Given '2' cukes   # features/tons_of_cukes.feature:25
+       Given '2' cukes   # features/tons_of_cukes.feature:26
+       Given '2' cukes   # features/tons_of_cukes.feature:27
+       Given '2' cukes   # features/tons_of_cukes.feature:28
+       Given '2' cukes   # features/tons_of_cukes.feature:29
+       Given '2' cukes   # features/tons_of_cukes.feature:30
+       Given '2' cukes   # features/tons_of_cukes.feature:31
+       Given '2' cukes   # features/tons_of_cukes.feature:32
+       Given '2' cukes   # features/tons_of_cukes.feature:33
+       Given '2' cukes   # features/tons_of_cukes.feature:34
+       Given '2' cukes   # features/tons_of_cukes.feature:35
+       Given '2' cukes   # features/tons_of_cukes.feature:36
+       Given '2' cukes   # features/tons_of_cukes.feature:37
+       Given '2' cukes   # features/tons_of_cukes.feature:38
+       Given '2' cukes   # features/tons_of_cukes.feature:39
+       Given '2' cukes   # features/tons_of_cukes.feature:40
+       Given '2' cukes   # features/tons_of_cukes.feature:41
+       Given '2' cukes   # features/tons_of_cukes.feature:42
+       Given '2' cukes   # features/tons_of_cukes.feature:43
+       Given '2' cukes   # features/tons_of_cukes.feature:44
+       Given '2' cukes   # features/tons_of_cukes.feature:45
+       Given '2' cukes   # features/tons_of_cukes.feature:46
+       Given '2' cukes   # features/tons_of_cukes.feature:47
+       Given '2' cukes   # features/tons_of_cukes.feature:48
+       Given '2' cukes   # features/tons_of_cukes.feature:49
+       Given '2' cukes   # features/tons_of_cukes.feature:50
+       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/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
+       Then I should have '10' cukes      # features/background/passing_background.feature:10
+       Then I should have '10' cukes      # features/background/pending_background.feature:7
+       Then I should have '10' cukes      # features/background/pending_background.feature:10
+       Then I should have '<count>' cukes # features/background/scenario_outline_failing_background.feature:7
+       Then I should have '<count>' cukes # features/background/scenario_outline_failing_background.feature:13
+       Then I should have '<count>' cukes # features/background/scenario_outline_passing_background.feature:7
+       Then I should have '<count>' cukes # features/background/scenario_outline_passing_background.feature:13
+      /^'(.+)' global cukes$/   # features/step_definitions/sample_steps.rb:35
+       And '10' global cukes    # features/background/failing_background_after_success.feature:5
+      /^I should have '(.+)' global cukes$/   # features/step_definitions/sample_steps.rb:42
+       Then I should have '10' global cukes   # features/background/failing_background_after_success.feature:8
+       Then I should have '10' global cukes   # features/background/failing_background_after_success.feature:11
+      /^table$/    # features/step_definitions/sample_steps.rb:46
+       Given table # features/background/multiline_args_background.feature:4
+      /^multiline string$/   # features/step_definitions/sample_steps.rb:50
+       And multiline string  # features/background/multiline_args_background.feature:7
+      /^the table should be$/   # features/step_definitions/sample_steps.rb:54
+       Then the table should be # features/background/multiline_args_background.feature:14
+       Then the table should be # features/background/multiline_args_background.feature:24
+      /^the multiline string should be$/   # features/step_definitions/sample_steps.rb:58
+       Then the multiline string should be # features/background/multiline_args_background.feature:17
+       Then the multiline string should be # features/background/multiline_args_background.feature:27
+      /^passing$/    # features/step_definitions/sample_steps.rb:5
+       Given passing # features/sample.feature:10
+      /^failing expectation$/    # features/step_definitions/sample_steps.rb:62
+       Given failing expectation # features/failing_expectation.feature:4
+      /^failing$/    # features/step_definitions/sample_steps.rb:8
+       Given failing # features/sample.feature:16
+
+      """
+

data/lib/autotest/cucumber_mixin.rb

@@ -1,7 +1,7 @@
 require 'autotest'
 require 'tempfile'
 require 'yaml'
-require File.dirname(__FILE__) + '/../cucumber'
+require 'cucumber'
 
 module Autotest::CucumberMixin
   def self.included(receiver)

data/lib/cucumber/ast/feature.rb

@@ -48,7 +48,7 @@ module Cucumber
       end
 
       def to_sexp
-        sexp = [:feature, @name]
+        sexp = [:feature, @file, @name]
         comment = @comment.to_sexp
         sexp += [comment] if comment
         tags = @tags.to_sexp

data/lib/cucumber/ast/features.rb

@@ -1,10 +1,16 @@
 module Cucumber
   module Ast
     class Features
+      include Enumerable
+
       def initialize
         @features = []
       end
 
+      def each(&proc)
+        @features.each(&proc)
+      end
+
       def add_feature(feature)
         feature.features = self
         @features << feature

data/lib/cucumber/ast/step.rb

@@ -78,19 +78,8 @@ module Cucumber
         @file_colon_line ||= @feature_element.file_colon_line(@line) unless @feature_element.nil?
       end
 
-      def actual_keyword
-        if [Cucumber.keyword_hash['and'], Cucumber.keyword_hash['but']].index(@keyword) && previous_step
-          previous_step.actual_keyword
-        else
-          @keyword
-        end
-      end
-
-      protected
-
-      # TODO: Remove when we use StepCollection everywhere
-      def previous_step
-        @feature_element.previous_step(self)
+      def dom_id
+        @dom_id ||= file_colon_line.gsub(/\//, '_').gsub(/\./, '_').gsub(/:/, '_')
       end
 
       private

data/lib/cucumber/ast/step_invocation.rb

@@ -28,7 +28,7 @@ module Cucumber
         unless @skip_invoke || options[:dry_run] || exception || @step_collection.exception
           @skip_invoke = true
           begin
-            step_mother.current_world.__cucumber_current_step = self
+            step_mother.current_world.__cucumber_current_step = self if step_mother.current_world # Nil in Pure Java
             @step_match.invoke(step_mother.current_world, @multiline_arg)
             status!(:passed)
           rescue Pending => e
@@ -79,10 +79,10 @@ module Cucumber
       end
 
       def actual_keyword
-        if [Cucumber.keyword_hash['and'], Cucumber.keyword_hash['but']].index(@keyword) && previous
+        if [Cucumber.keyword_hash['and'], Cucumber.keyword_hash['but']].index(@step.keyword) && previous
           previous.actual_keyword
         else
-          @step.keyword
+          keyword
         end
       end
 
@@ -94,10 +94,18 @@ module Cucumber
         @step.text_length
       end
 
+      def keyword
+        @step.keyword
+      end
+
       def file_colon_line
         @step.file_colon_line
       end
 
+      def dom_id
+        @step.dom_id
+      end
+
       def backtrace_line
         @step.backtrace_line
       end

data/lib/cucumber/ast/table.rb

@@ -264,6 +264,10 @@ module Cucumber
           @cells[0].line
         end
 
+        def dom_id
+          "row_#{line}"
+        end
+
         def status=(status)
           each do |cell|
             cell.status = status

data/lib/cucumber/cli/configuration.rb

@@ -1,7 +1,7 @@
 module Cucumber
   module Cli
     class YmlLoadError < StandardError; end
-  
+
     class Configuration
       FORMATS = %w{pretty profile progress rerun}
       DEFAULT_FORMAT = 'pretty'
@@ -95,6 +95,7 @@ module Cucumber
             Term::ANSIColor.coloring = v
           end
           opts.on("-d", "--dry-run", "Invokes formatters without executing the steps.",
+            "This also omits the loading of your support/env.rb file if it exists.",
             "Implies --quiet.") do
             @options[:dry_run] = true
             @quiet = true
@@ -137,9 +138,6 @@ module Cucumber
           opts.on("--no-diff", "Disable diff output on failing expectations.") do
             @options[:diff_enabled] = false
           end
-          opts.on("-S", "--step-definitions", "Print the regexp and line of all step definitions, then exit.") do
-            @options[:print_step_definitions] = true
-          end
           opts.on_tail("--version", "Show version.") do
             @out_stream.puts VERSION::STRING
             Kernel.exit
@@ -175,10 +173,6 @@ module Cucumber
         @options[:diff_enabled]
       end
 
-      def print_step_definitions?
-        @options[:print_step_definitions]
-      end
-
       def load_language
         if Cucumber.language_incomplete?(@options[:lang])
           list_keywords_and_exit(@options[:lang])
@@ -224,11 +218,12 @@ module Cucumber
     
       def formatter_class(format)
         case format
+          when 'html'     then Formatter::Html
           when 'pretty'   then Formatter::Pretty
-          when 'progress' then Formatter::Progress
           when 'profile'  then Formatter::Profile
+          when 'progress' then Formatter::Progress
           when 'rerun'    then Formatter::Rerun
-          when 'html'     then Formatter::Html
+          when 'usage'    then Formatter::Usage
         else
           constantize(format)
         end
@@ -242,7 +237,9 @@ module Cucumber
         end.flatten.uniq
         sorted_files = files.sort { |a,b| (b =~ %r{/support/} || -1) <=>  (a =~ %r{/support/} || -1) }.reject{|f| f =~ /^http/}
         env_files = sorted_files.select {|f| f =~ %r{/support/env.rb} }
-        env_files + sorted_files.reject {|f| f =~ %r{/support/env.rb} }
+        files = env_files + sorted_files.reject {|f| f =~ %r{/support/env.rb} }
+        files.reject! {|f| f =~ %r{/support/env.rb} } if @options[:dry_run]
+        files
       end
     
       def feature_files
@@ -305,18 +302,18 @@ Defined profiles in cucumber.yml:
       def cucumber_yml
         return @cucumber_yml if @cucumber_yml
         unless File.exist?('cucumber.yml')
-          raise(YmlLoadError,"cucumber.yml was not found.  Please refer to cucumber's documentaion on defining profiles in cucumber.yml.  You must define a 'default' profile to use the cucumber command without any arguments.\nType 'cucumber --help' for usage.\n")
+          raise(YmlLoadError,"cucumber.yml was not found.  Please refer to cucumber's documentation on defining profiles in cucumber.yml.  You must define a 'default' profile to use the cucumber command without any arguments.\nType 'cucumber --help' for usage.\n")
         end
 
         require 'yaml'
         begin
           @cucumber_yml = YAML::load(IO.read('cucumber.yml'))
         rescue Exception => e
-          raise(YmlLoadError,"cucumber.yml was found, but could not be parsed. Please refer to cucumber's documentaion on correct profile usage.\n")
+          raise(YmlLoadError,"cucumber.yml was found, but could not be parsed. Please refer to cucumber's documentation on correct profile usage.\n")
         end
 
         if @cucumber_yml.nil? || !@cucumber_yml.is_a?(Hash)
-          raise(YmlLoadError,"cucumber.yml was found, but was blank or malformed. Please refer to cucumber's documentaion on correct profile usage.\n")
+          raise(YmlLoadError,"cucumber.yml was found, but was blank or malformed. Please refer to cucumber's documentation on correct profile usage.\n")
         end
 
         return @cucumber_yml