aslakhellesoy-cucumber 0.3.5 → 0.3.6.1

data/lib/cucumber.rb

@@ -14,6 +14,7 @@ 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:
@@ -38,6 +39,10 @@ module Cucumber
     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('|')}

data/lib/cucumber/ast/background.rb

@@ -28,15 +28,15 @@ module Cucumber
         visitor.step_mother.before(hook_context)
         visitor.visit_steps(@step_invocations)
         @failed = @step_invocations.detect{|step_invocation| step_invocation.exception}
-        visitor.step_mother.after(hook_context) if @failed
+        visitor.step_mother.after(hook_context) if @failed || @feature_elements.empty?
       end
 
       def accept_hook?(hook)
         if hook_context != self
           hook_context.accept_hook?(hook)
         else
-          # We have no scenarios
-          false
+          # We have no scenarios, just ask our feature
+          @feature.accept_hook?(hook)
         end
       end
 

data/lib/cucumber/ast/outline_table.rb

@@ -10,7 +10,11 @@ module Cucumber
 
       def accept(visitor)
         cells_rows.each_with_index do |row, n|
-          visitor.visit_table_row(row)
+          if(visitor.options[:expand])
+            row.accept(visitor)
+          else
+            visitor.visit_table_row(row)
+          end
         end
         nil
       end
@@ -35,8 +39,14 @@ module Cucumber
         cells_rows[1..-1]
       end
 
+      def visit_scenario_name(visitor, row)
+        @scenario_outline.visit_scenario_name(visitor, row)
+      end
+
       class ExampleCells < Cells
+        
         def create_step_invocations!(scenario_outline)
+          @scenario_outline = scenario_outline
           @step_invocations = scenario_outline.step_invocations(self)
         end
         
@@ -47,6 +57,10 @@ module Cucumber
         end
 
         def accept(visitor)
+          visitor.options[:expand] ? accept_expand(visitor) : accept_plain(visitor)
+        end
+
+        def accept_plain(visitor)
           if header?
             @cells.each do |cell|
               cell.status = :skipped_param
@@ -62,6 +76,22 @@ module Cucumber
               @cells.each do |cell|
                 visitor.visit_table_cell(cell)
               end
+              
+              visitor.visit_exception(@scenario_exception, :failed) if @scenario_exception
+            end
+          end
+        end
+
+        def accept_expand(visitor)
+          if header?
+          else
+            visitor.step_mother.before_and_after(self) do
+              @table.visit_scenario_name(visitor, self)
+              @step_invocations.each do |step_invocation|
+                step_invocation.invoke(visitor.step_mother, visitor.options)
+                @exception ||= step_invocation.exception
+                step_invocation.visit_step_result(visitor)
+              end
             end
           end
         end
@@ -69,22 +99,39 @@ module Cucumber
         def accept_hook?(hook)
           @table.accept_hook?(hook)
         end
-
+        
+        def exception
+          @exception || @scenario_exception
+        end
+        
+        def fail!(exception)
+          @scenario_exception = exception
+        end
+        
         # Returns true if one or more steps failed
         def failed?
-          @step_invocations.failed?
+          @step_invocations.failed? || !!@scenario_exception
         end
 
         # Returns true if all steps passed
         def passed?
-          @step_invocations.passed?
+          !failed?
         end
 
         # Returns the status
         def status
+          return :failed if @scenario_exception
           @step_invocations.status
         end
 
+        def backtrace_line
+          @scenario_outline.backtrace_line(name, line)
+        end
+
+        def name
+          "| #{@cells.collect{|c| c.value }.join(' | ')} |"
+        end
+
         private
 
         def header?

data/lib/cucumber/ast/scenario.rb

@@ -28,25 +28,31 @@ module Cucumber
         visitor.step_mother.before_and_after(self, skip) do
           visitor.visit_steps(@steps)
         end
+        visitor.visit_exception(@exception, :failed) if @exception
       end
 
       # Returns true if one or more steps failed
       def failed?
-        @steps.failed?
+        @steps.failed? || !!@exception
+      end
+      
+      def fail!(exception)
+        @exception = exception
       end
 
       # Returns true if all steps passed
       def passed?
-        @steps.passed?
+        !failed?
       end
 
       # Returns the first exception (if any)
       def exception
-        @steps.exception
+        @exception || @steps.exception
       end
 
       # Returns the status
       def status
+        return :failed if @exception
         @steps.status
       end
 

data/lib/cucumber/ast/scenario_outline.rb

@@ -61,6 +61,10 @@ module Cucumber
         end
       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))
+      end
+
       def to_sexp
         sexp = [:scenario_outline, @keyword, @name]
         comment = @comment.to_sexp

data/lib/cucumber/ast/step.rb

@@ -51,7 +51,7 @@ module Cucumber
           step_match          = visitor.step_mother.step_match(name, @name) rescue nil
           return step_match if step_match
         end
-        NoStepMatch.new(self)
+        NoStepMatch.new(self, @name)
       end
 
       def to_sexp
@@ -62,8 +62,8 @@ module Cucumber
         @feature_element.source_indent(text_length)
       end
 
-      def text_length
-        @keyword.jlength + @name.jlength + INDENT # Add indent as steps get indented more than scenarios
+      def text_length(name=@name)
+        @keyword.jlength + name.jlength + INDENT # Add indent as steps get indented more than scenarios
       end
 
       def backtrace_line

data/lib/cucumber/ast/step_invocation.rb

@@ -20,7 +20,11 @@ module Cucumber
 
       def accept(visitor)
         invoke(visitor.step_mother, visitor.options)
-        @step.visit_step_result(visitor, @step_match, @multiline_arg, @status, @exception, @background)
+        visit_step_result(visitor)
+      end
+
+      def visit_step_result(visitor)
+        visitor.visit_step_result(keyword, @step_match, @multiline_arg, @status, @exception, source_indent, @background)
       end
 
       def invoke(step_mother, options)
@@ -30,6 +34,7 @@ module Cucumber
           begin
             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)
+            step_mother.after_step
             status!(:passed)
           rescue Pending => e
             failed(e, false)
@@ -51,11 +56,11 @@ module Cucumber
         rescue Undefined => e
           failed(e, true)
           status!(:undefined)
-          @step_match = NoStepMatch.new(@step)
+          @step_match = NoStepMatch.new(@step, @name)
         rescue Ambiguous => e
           failed(e, false)
           status!(:failed)
-          @step_match = NoStepMatch.new(@step)
+          @step_match = NoStepMatch.new(@step, @name)
         end
         step_mother.step_visited(self)
       end
@@ -85,8 +90,12 @@ module Cucumber
         end
       end
 
+      def source_indent
+        @step.feature_element.source_indent(text_length)
+      end
+
       def text_length
-        @step.text_length
+        @step.text_length(@name)
       end
 
       def keyword

data/lib/cucumber/cli/configuration.rb

@@ -3,7 +3,15 @@ module Cucumber
     class YmlLoadError < StandardError; end
 
     class Configuration
-      FORMATS = %w{pretty profile progress rerun junit}
+      BUILTIN_FORMATS = {
+        'html'     => 'Cucumber::Formatter::Html',
+        'pretty'   => 'Cucumber::Formatter::Pretty',
+        'profile'  => 'Cucumber::Formatter::Profile',
+        'progress' => 'Cucumber::Formatter::Progress',
+        'rerun'    => 'Cucumber::Formatter::Rerun',
+        'usage'    => 'Cucumber::Formatter::Usage',
+        'junit'    => 'Cucumber::Formatter::Junit'
+      }
       DEFAULT_FORMAT = 'pretty'
 
       attr_reader :paths
@@ -57,12 +65,15 @@ module Cucumber
           end
           opts.on("-f FORMAT", "--format FORMAT",
             "How to format features (Default: #{DEFAULT_FORMAT})",
-            "Available formats: #{FORMATS.join(", ")}",
-            "You can also provide your own formatter classes as long",
-            "as they have been previously required using --require or",
-            "if they are in the folder structure such that cucumber",
-            "will require them automatically.",
-            "This option can be specified multiple times.") do |v|
+            "Available formats: #{BUILTIN_FORMATS.keys.sort.join(", ")}",
+            "FORMAT can also be the fully qualified class name of",
+            "your own custom formatter. If the class isn't loaded,",
+            "Cucumber will attempt to require a file with a relative",
+            "file name that is the underscore name of the class name.",
+            "Example: --format Foo::BarZap -> Cucumber will look for",
+            "foo/bar_zap.rb. You can place the file with this relative",
+            "path underneath your features/support directory or anywhere",
+            "on Ruby's LOAD_PATH, for example in a Ruby gem.") do |v|
             @options[:formats][v] = @out_stream
             @active_format = v
           end
@@ -132,12 +143,18 @@ module Cucumber
           opts.on("-S", "--strict", "Fail if there are any undefined steps.") do
             @options[:strict] = true
           end
+          opts.on("-w", "--wip", "Fail if there are any passing scenarios.") do
+            @options[:wip] = true
+          end
           opts.on("-v", "--verbose", "Show the files and features loaded.") do
             @options[:verbose] = true
           end
           opts.on("-g", "--guess", "Guess best match for Ambiguous steps.") do
             @options[:guess] = true
           end
+          opts.on("-x", "--expand", "Expand Scenario Outline Tables in output.") do
+            @options[:expand] = true
+          end
           opts.on("--no-diff", "Disable diff output on failing expectations.") do
             @options[:diff_enabled] = false
           end
@@ -156,6 +173,8 @@ module Cucumber
         @options[:snippets] = true if !@quiet && @options[:snippets].nil?
         @options[:source]   = true if !@quiet && @options[:source].nil?
 
+        raise("You can't use both --strict and --wip") if @options[:strict] && @options[:wip]
+
         # Whatever is left after option parsing is the FILE arguments
         @paths += args
       end
@@ -168,6 +187,10 @@ module Cucumber
         @options[:strict]
       end
 
+      def wip?
+        @options[:wip]
+      end
+
       def guess?
         @options[:guess]
       end
@@ -223,14 +246,8 @@ module Cucumber
       end
 
       def formatter_class(format)
-        case format
-          when 'html'     then Formatter::Html
-          when 'pretty'   then Formatter::Pretty
-          when 'profile'  then Formatter::Profile
-          when 'progress' then Formatter::Progress
-          when 'rerun'    then Formatter::Rerun
-          when 'usage'    then Formatter::Usage
-          when 'junit'    then Formatter::JUnit
+        if(builtin = BUILTIN_FORMATS[format])
+          constantize(builtin)
         else
           constantize(format)
         end
@@ -271,14 +288,28 @@ module Cucumber
       end
 
       def constantize(camel_cased_word)
-        names = camel_cased_word.split('::')
-        names.shift if names.empty? || names.first.empty?
+        begin
+          names = camel_cased_word.split('::')
+          names.shift if names.empty? || names.first.empty?
 
-        constant = Object
-        names.each do |name|
-          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+          constant = Object
+          names.each do |name|
+            constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+          end
+          constant
+        rescue NameError
+          require underscore(camel_cased_word)
+          retry
         end
-        constant
+      end
+
+      # Snagged from active_support
+      def underscore(camel_cased_word)
+        camel_cased_word.to_s.gsub(/::/, '/').
+          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+          tr("-", "_").
+          downcase
       end
 
       def parse_args_from_profile(profile)
@@ -295,10 +326,10 @@ Defined profiles in cucumber.yml:
 
         case(args_from_yml)
           when String
-            raise "The '#{profile}' profile in cucumber.yml was blank.  Please define the command line arguments for the 'foo' profile in cucumber.yml.\n" if args_from_yml =~ /^\s*$/
+            raise "The '#{profile}' profile in cucumber.yml was blank.  Please define the command line arguments for the '#{profile}' profile in cucumber.yml.\n" if args_from_yml =~ /^\s*$/
             args_from_yml = args_from_yml.split(' ')
           when Array
-            raise "The '#{profile}' profile in cucumber.yml was empty.  Please define the command line arguments for the 'foo' profile in cucumber.yml.\n" if args_from_yml.empty?
+            raise "The '#{profile}' profile in cucumber.yml was empty.  Please define the command line arguments for the '#{profile}' profile in cucumber.yml.\n" if args_from_yml.empty?
           else
             raise "The '#{profile}' profile in cucumber.yml was a #{args_from_yml.class}. It must be a String or Array"
         end

data/lib/cucumber/cli/main.rb

@@ -2,7 +2,7 @@ require 'optparse'
 require 'cucumber'
 require 'ostruct'
 require 'cucumber/parser'
-require 'cucumber/formatter'
+require 'cucumber/formatter/color_io'
 require 'cucumber/cli/language_help_formatter'
 require 'cucumber/cli/configuration'
 
@@ -40,8 +40,12 @@ module Cucumber
         step_mother.visitor = visitor # Needed to support World#announce
         visitor.visit_features(features)
 
-        failure = step_mother.steps(:failed).any? || 
+        failure = if configuration.wip?
+          step_mother.scenarios(:passed).any?
+        else
+          step_mother.scenarios(:failed).any? || 
           (configuration.strict? && step_mother.steps(:undefined).any?)
+        end
       end
 
       def load_plain_text_features

data/lib/cucumber/formatter/console.rb

@@ -85,6 +85,15 @@ module Cucumber
         @io.flush
       end
 
+      def print_passing_wip(options)
+        return unless options[:wip]
+        passed = step_mother.scenarios(:passed)
+        if passed.any?
+          @io.puts "\nThe --wip switch was used, so I didn't expect anything to pass. These scenarios passed:"
+          print_elements(passed, :passed, "scenarios")
+        end
+      end
+
       def announce(announcement)
         @io.puts
         @io.puts(format_string(announcement, :tag))

data/lib/cucumber/formatter/junit.rb

@@ -7,7 +7,7 @@ end
 
 module Cucumber
   module Formatter
-    class JUnit < Cucumber::Ast::Visitor
+    class Junit < Cucumber::Ast::Visitor
 
       def initialize(step_mother, io, options)
         super(step_mother)