kosmas58-cucumber 0.2.0.1 → 0.2.2.1

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

data/lib/cucumber/cli/main.rb

@@ -32,13 +32,6 @@ module Cucumber
         step_mother.options = configuration.options
 
         require_files
-
-        if(configuration.print_step_definitions?)
-          step_mother.print_step_definitions(@out_stream)
-          Kernel.exit(0)
-          return # In specs, exit is stubbed
-        end
-        
         enable_diffing
       
         features = load_plain_text_features
@@ -53,7 +46,18 @@ module Cucumber
         Kernel.exit(failure ? 1 : 0)
       end
 
-      private
+      def load_plain_text_features
+        features = Ast::Features.new
+        parser = Parser::FeatureParser.new
+
+        verbose_log("Features:")
+        configuration.feature_files.each do |f|
+          features.add_feature(parser.parse_file(f))
+          verbose_log("  * #{f}")
+        end
+        verbose_log("\n"*2)
+        features
+      end
 
       def configuration
         return @configuration if @configuration
@@ -62,6 +66,8 @@ module Cucumber
         @configuration.parse!(@args)
         @configuration
       end
+
+      private
     
       def require_files
         verbose_log("Ruby files required:")
@@ -77,19 +83,6 @@ module Cucumber
         verbose_log("\n")
       end
 
-      def load_plain_text_features
-        features = Ast::Features.new
-        parser = Parser::FeatureParser.new
-
-        verbose_log("Features:")
-        configuration.feature_files.each do |f|
-          features.add_feature(parser.parse_file(f))
-          verbose_log("  * #{f}")
-        end
-        verbose_log("\n"*2)
-        features
-      end
-
       def verbose_log(string)
         @out_stream.puts(string) if configuration.verbose?
       end

data/lib/cucumber/core_ext/exception.rb

@@ -20,7 +20,7 @@
 #
 class Exception
   CUCUMBER_FILTER_PATTERNS = [
-    /vendor\/rails|lib\/cucumber|lib\/rspec|gems\//
+    /vendor\/rails|lib\/cucumber|bin\/cucumber:|lib\/rspec|gems\//
   ]
 
   INSTANCE_EXEC_OFFSET = (Cucumber::RUBY_1_9 || Cucumber::JRUBY) ? -3 : -4

data/lib/cucumber/formatter.rb

@@ -1 +1 @@
-%w{color_io pretty progress profile rerun html}.each{|n| require "cucumber/formatter/#{n}"}
+%w{color_io pretty progress profile rerun html usage}.each{|n| require "cucumber/formatter/#{n}"}

data/lib/cucumber/formatter/html.rb

@@ -83,37 +83,73 @@ module Cucumber
         @builder.h4("#{keyword} #{name}")
       end
 
-      def visit_steps(scenarios)
+      def visit_steps(steps)
         @builder.ol do
           super
         end
       end
 
+      def visit_step(step)
+        @step_id = step.dom_id
+        @builder.li(:id => @step_id) do
+          super
+        end
+      end
+
       def visit_step_name(keyword, step_match, status, source_indent, background)
-        step_name = step_match.format_args(lambda{|param| "<span>#{param}</span>"})
-        @builder.li("#{keyword} #{step_name}", :class => status)
+        @step_matches ||= []
+        @skip_step = @step_matches.index(step_match)
+        @step_matches << step_match
+
+        unless @skip_step
+          step_name = step_match.format_args(lambda{|param| "<span>#{param}</span>"})
+          @builder.div(:class => status) do |div|
+            div << "#{keyword} #{step_name}"
+          end
+        end
+      end
+
+      def visit_exception(exception, status)
+        @builder.pre(format_exception(exception), :class => status)
       end
 
       def visit_multiline_arg(multiline_arg)
+        return if @skip_step
         if Ast::Table === multiline_arg
           @builder.table do
             super
           end
         else
-          @builder.p do
-            super
-          end
+          super
+        end
+      end
+
+      def visit_py_string(string, status)
+        @builder.pre(:class => status) do |pre|
+          pre << string
         end
       end
 
       def visit_table_row(table_row)
-        @builder.tr do
+        @row_id = table_row.dom_id
+        @col_index = 0
+        @builder.tr(:id => @row_id) do
           super
         end
+        if table_row.exception
+          @builder.tr do
+            @builder.td(:colspan => @col_index.to_s, :class => 'failed') do
+              @builder.pre do |pre|
+                pre << format_exception(table_row.exception)
+              end
+            end
+          end
+        end
       end
 
       def visit_table_cell_value(value, width, status)
-        @builder.td(value, :class => status)
+        @builder.td(value, :class => status, :id => "#{@row_id}_#{@col_index}")
+        @col_index += 1
       end
 
       def announce(announcement)
@@ -128,6 +164,9 @@ module Cucumber
         end
       end
 
+      def format_exception(exception)
+        (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
+      end
     end
   end
 end

data/lib/cucumber/formatter/pretty.rb

@@ -121,16 +121,15 @@ module Cucumber
 
       def visit_step_name(keyword, step_match, status, source_indent, background)
         @step_matches ||= []
-        
         non_failed_background_step_outside_background = !@in_background && background && (status != :failed)
         @skip_step = @step_matches.index(step_match) || non_failed_background_step_outside_background
+        @step_matches << step_match
         
         unless(@skip_step)
           source_indent = nil unless @options[:source]
           formatted_step_name = format_step(keyword, step_match, status, source_indent)
           @io.puts("    " + formatted_step_name)
         end
-        @step_matches << step_match
       end
 
       def visit_multiline_arg(multiline_arg)

data/lib/cucumber/formatter/rerun.rb

@@ -1,5 +1,13 @@
 module Cucumber
   module Formatter
+    # This formatter keeps track of all failing features and print out their location.
+    # Example:
+    #
+    #   features/foo.feature:34 features/bar.feature:11:76:81
+    #
+    # This formatter is used by AutoTest - it will use the output to decide what
+    # to run the next time, simply passing the output string on the command line.
+    #
     class Rerun < Ast::Visitor
       def initialize(step_mother, io, options)
         super(step_mother)

data/lib/cucumber/formatter/usage.rb

@@ -0,0 +1,69 @@
+require 'cucumber/formatter/progress'
+
+module Cucumber
+  module Formatter
+    class Usage < Ast::Visitor
+      include Console
+
+      def initialize(step_mother, io, options)
+        super(step_mother)
+        @io = io
+        @options = options
+        @step_definitions = Hash.new { |h,step_definition| h[step_definition] = [] }
+        @locations = []
+      end
+
+      def visit_features(features)
+        super
+        print_summary
+      end
+
+      def visit_step(step)
+        @step = step
+        super
+      end
+
+      def visit_step_name(keyword, step_match, status, source_indent, background)
+        if step_match.step_definition
+          location = @step.file_colon_line
+          return if @locations.index(location)
+          @locations << location
+          
+          description = format_step(keyword, step_match, status, nil)
+          length = (keyword + step_match.format_args).jlength
+          @step_definitions[step_match.step_definition] << [step_match, description, length, location]
+        end
+      end
+
+      def print_summary
+        sorted_defs = @step_definitions.keys.sort_by{|step_definition| step_definition.backtrace_line}
+        
+        sorted_defs.each do |step_definition|          
+          step_matches_and_descriptions = @step_definitions[step_definition].sort_by do |step_match_and_description|
+            step_match = step_match_and_description[0]
+            step_match.step_definition.regexp.inspect
+          end
+
+          step_matches = step_matches_and_descriptions.map{|step_match_and_description| step_match_and_description[0]}
+
+          lengths = step_matches_and_descriptions.map do |step_match_and_description| 
+            step_match_and_description[2]
+          end
+          lengths << step_definition.text_length
+          max_length = lengths.max
+
+          @io.print step_definition.regexp.inspect
+          @io.puts format_string("   # #{step_definition.file_colon_line}".indent(max_length - step_definition.text_length), :comment)
+          step_matches_and_descriptions.each do |step_match_and_description|
+            step_match      = step_match_and_description[0]
+            description     = step_match_and_description[1]
+            length          = step_match_and_description[2]
+            file_colon_line = step_match_and_description[3]
+            @io.print " #{description}"
+            @io.puts format_string(" # #{file_colon_line}".indent(max_length - length), :comment)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/languages.yml

@@ -211,8 +211,10 @@
   native: italiano
   encoding: UTF-8
   feature: Funzionalità
+  background: Contesto
   scenario: Scenario
-  more_examples: Più esempi
+  scenario_outline: Schema dello scenario
+  examples: Esempi
   given: Dato
   when: Quando
   then: Allora
@@ -225,7 +227,7 @@
   feature: フィーチャ
   background: 背景
   scenario: シナリオ
-  scenario_outline: シナリオテンプレート|テンプレ|シナリオテンプレ
+  scenario_outline: シナリオアウトライン|シナリオテンプレート|テンプレ|シナリオテンプレ
   examples: 例|サンプル
   given: 前提
   when: もし
@@ -249,7 +251,10 @@
   native: Nederlands
   encoding: UTF-8
   feature: Functionaliteit
+  background: Achtergrond
   scenario: Scenario
+  scenario_outline: Abstract Scenario
+  examples: Voorbeelden
   given: Gegeven
   when: Als
   then: Dan

data/lib/cucumber/rails/world.rb

@@ -9,22 +9,10 @@ else
 end
 require 'test/unit/testresult'
 
-# These allow exceptions to come through as opposed to being caught and having non-helpful responses returned.
-ActionController::Base.class_eval do
-  def rescue_action(exception)
-    raise exception
-  end
-end
-ActionController::Dispatcher.class_eval do
-  def self.failsafe_response(output, status, exception = nil)
-    raise exception
-  end
-end
-
 # So that Test::Unit doesn't launch at the end - makes it think it has already been run.
 Test::Unit.run = true if Test::Unit.respond_to?(:run=)
 
-$cucumber_toplevel = self
+$__cucumber_toplevel = self
 
 module Cucumber #:nodoc:
   module Rails
@@ -44,20 +32,21 @@ module Cucumber #:nodoc:
     def self.use_transactional_fixtures
       World.use_transactional_fixtures = true
       if defined?(ActiveRecord::Base)
-        $cucumber_toplevel.Before do
-          if ActiveRecord::Base.connection.respond_to?(:increment_open_transactions)
-            ActiveRecord::Base.connection.increment_open_transactions
+        $__cucumber_toplevel.Before do
+          @__cucumber_ar_connection = ActiveRecord::Base.connection
+          if @__cucumber_ar_connection.respond_to?(:increment_open_transactions)
+            @__cucumber_ar_connection.increment_open_transactions
           else
             ActiveRecord::Base.__send__(:increment_open_transactions)
           end
-          ActiveRecord::Base.connection.begin_db_transaction
+          @__cucumber_ar_connection.begin_db_transaction
           ActionMailer::Base.deliveries = [] if defined?(ActionMailer::Base)
         end
         
-        $cucumber_toplevel.After do
-          ActiveRecord::Base.connection.rollback_db_transaction
-          if ActiveRecord::Base.connection.respond_to?(:decrement_open_transactions)
-            ActiveRecord::Base.connection.decrement_open_transactions
+        $__cucumber_toplevel.After do
+          @__cucumber_ar_connection.rollback_db_transaction
+          if @__cucumber_ar_connection.respond_to?(:decrement_open_transactions)
+            @__cucumber_ar_connection.decrement_open_transactions
           else
             ActiveRecord::Base.__send__(:decrement_open_transactions)
           end
@@ -65,6 +54,18 @@ module Cucumber #:nodoc:
       end
     end
 
+    def self.bypass_rescue
+      ActionController::Base.class_eval do
+        def rescue_action(exception)
+          raise exception
+        end
+      end
+      ActionController::Dispatcher.class_eval do
+        def self.failsafe_response(output, status, exception = nil)
+          raise exception
+        end
+      end
+    end
   end
 end