cucumber 0.3.7 → 0.3.8

data/features/step_definitions/cucumber_steps.rb

@@ -79,13 +79,21 @@ Then /^"(.*)" should contain XML$/ do |file, xml|
 end
 
 Then /^"(.*)" should contain$/ do |file, text|
-  IO.read(file).should == text
+  strip_duration(IO.read(file)).should == text
 end
 
 Then /^"(.*)" should match$/ do |file, text|
   IO.read(file).should =~ Regexp.new(text)
 end
 
+Then /^"([^\"]*)" should have the same contents as "([^\"]*)"$/ do |actual_file, expected_file|
+  actual = IO.read(actual_file)
+  # Comment out to replace expected file. Use with care! Remember to update duration afterwards.
+  # File.open(expected_file, "w"){|io| io.write(actual)}
+  actual = replace_duration(actual, '0m30.005s')
+  actual.should == IO.read(expected_file)
+end
+
 Then /^STDERR should match$/ do |text|
   last_stderr.should =~ /#{text}/
 end

data/features/support/env.rb

@@ -30,7 +30,20 @@ class CucumberWorld
   end
 
   private
-  attr_reader :last_exit_status, :last_stdout, :last_stderr
+  attr_reader :last_exit_status, :last_stderr
+
+  # The last standard out, with the duration line taken out (unpredictable)
+  def last_stdout
+    strip_duration(@last_stdout)
+  end
+
+  def strip_duration(s)
+    s.gsub(/^\d+m\d+\.\d+s\n/m, "")
+  end
+
+  def replace_duration(s, replacement)
+    s.gsub(/\d+m\d+\.\d+s/m, replacement)
+  end
 
   def create_file(file_name, file_content)
     file_content.gsub!("CUCUMBER_LIB", "'#{cucumber_lib_dir}'") # Some files, such as Rakefiles need to use the lib dir

data/lib/cucumber/ast/features.rb

@@ -3,6 +3,8 @@ module Cucumber
     class Features
       include Enumerable
 
+      attr_reader :duration
+
       def initialize
         @features = []
       end
@@ -17,9 +19,11 @@ module Cucumber
       end
 
       def accept(visitor)
+        start = Time.now
         @features.each do |feature|
           visitor.visit_feature(feature)
         end
+        @duration = Time.now - start
       end
     end
   end

data/lib/cucumber/ast/outline_table.rb

@@ -4,7 +4,7 @@ module Cucumber
       def initialize(raw, scenario_outline)
         super(raw)
         @scenario_outline = scenario_outline
-        @cells_class = ExampleCells
+        @cells_class = ExampleRow
         create_step_invocations_for_example_rows!(scenario_outline)
       end
 
@@ -43,7 +43,7 @@ module Cucumber
         @scenario_outline.visit_scenario_name(visitor, row)
       end
 
-      class ExampleCells < Cells
+      class ExampleRow < Cells
         
         def create_step_invocations!(scenario_outline)
           @scenario_outline = scenario_outline

data/lib/cucumber/ast/scenario.rb

@@ -5,6 +5,8 @@ module Cucumber
     class Scenario
       include FeatureElement
       
+      attr_reader :name, :line
+      
       def initialize(background, comment, tags, line, keyword, name, steps)
         @background, @comment, @tags, @line, @keyword, @name = background, comment, tags, line, keyword, name
         attach_steps(steps)

data/lib/cucumber/cli/configuration.rb

@@ -257,6 +257,7 @@ module Cucumber
         requires = @options[:require] || feature_dirs
         files = requires.map do |path|
           path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
+          path = path.gsub(/\/$/, '') # Strip trailing slash.
           File.directory?(path) ? Dir["#{path}/**/*.rb"] : path
         end.flatten.uniq
         sorted_files = files.sort { |a,b| (b =~ %r{/support/} || -1) <=>  (a =~ %r{/support/} || -1) }.reject{|f| f =~ /^http/}

data/lib/cucumber/cli/main.rb

@@ -75,11 +75,12 @@ module Cucumber
       private
     
       def require_files
+        requires = configuration.files_to_require
         verbose_log("Ruby files required:")
-        configuration.files_to_require.each do |lib|
+        verbose_log(requires.map{|lib| "  * #{lib}"}.join("\n"))
+        requires.each do |lib|
           begin
             require lib
-            verbose_log("  * #{lib}")
           rescue LoadError => e
             e.message << "\nFailed to load #{lib}"
             raise e
@@ -93,14 +94,18 @@ module Cucumber
       end
 
       def enable_diffing
-        if configuration.diff_enabled? && defined?(::Spec)
+        if configuration.diff_enabled?
           begin
-            require 'spec/runner/differs/default' # RSpec >=1.2.4
-          rescue ::LoadError
-            require 'spec/expectations/differs/default' # RSpec <=1.2.3
+            require 'spec/expectations'
+            begin
+              require 'spec/runner/differs/default' # RSpec >=1.2.4
+            rescue ::LoadError
+              require 'spec/expectations/differs/default' # RSpec <=1.2.3
+            end
+            options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
+            ::Spec::Expectations.differ = ::Spec::Expectations::Differs::Default.new(options)
+          rescue ::LoadError => ignore
           end
-          options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
-          ::Spec::Expectations.differ = ::Spec::Expectations::Differs::Default.new(options)
         end
       end
     

data/lib/cucumber/formatter/console.rb

@@ -1,9 +1,12 @@
 require 'cucumber/formatter/ansicolor'
+require 'cucumber/formatter/duration'
 
 module Cucumber
   module Formatter
     module Console
       extend ANSIColor
+      include Duration
+      
       FORMATS = Hash.new{|hash, format| hash[format] = method(format).to_proc}
 
       def format_step(keyword, step_match, status, source_indent)
@@ -50,13 +53,15 @@ module Cucumber
         end
       end
 
-      def print_counts
+      def print_stats(features)
         @io.print dump_count(step_mother.scenarios.length, "scenario")
         print_status_counts{|status| step_mother.scenarios(status)}
 
         @io.print dump_count(step_mother.steps.length, "step")
         print_status_counts{|status| step_mother.steps(status)}
 
+        @io.puts(format_duration(features.duration))
+
         @io.flush
       end
       

data/lib/cucumber/formatter/cucumber.css

@@ -1,34 +1,53 @@
-
-
-
-
-
 .cucumber {
   background: black;
   color: white;
   padding: 1em;
 }
 .cucumber .passed {
-  color: green;
+  color: #008800;
 }
 .cucumber .undefined {
-  color: yellow;
+  color: #888800;
 }
 .cucumber .pending {
-  color: yellow;
+  color: #888800;
 }
 .cucumber .failed {
-  color: red;
+  color: #880000;
 }
 .cucumber .skipped {
-  color: cyan;
+  color: #008888;
 }
 .cucumber .outline {
-  color: cyan;
+  color: #008888;
+}
+
+.cucumber .passed_param {
+  font-weight: bold;
+  color: #00ff00;
+}
+.cucumber .undefined_param {
+  font-weight: bold;
+  color: #ffff00;
 }
-.cucumber .param {
+.cucumber .pending_param {
   font-weight: bold;
+  color: #ffff00;
 }
+.cucumber .failed_param {
+  font-weight: bold;
+  font-weight: bold;
+  color: #ff0000;
+}
+.cucumber .skipped_param {
+  font-weight: bold;
+  color: #00ffff;
+}
+.cucumber .outline_param {
+  font-weight: bold;
+  color: #00ffff;
+}
+
 .cucumber a {
   text-decoration: none;
   color: inherit;

data/lib/cucumber/formatter/duration.rb

@@ -0,0 +1,10 @@
+module Cucumber
+  module Formatter
+    module Duration
+      def format_duration(seconds)
+        m, s = seconds.divmod(60)
+        "#{m}m#{'%.3f' % s}s" 
+      end
+    end
+  end
+end

data/lib/cucumber/formatter/html.rb

@@ -5,11 +5,13 @@ rescue LoadError
   gem 'builder'
   require 'builder'
 end
+require 'cucumber/formatter/duration'
 
 module Cucumber
   module Formatter
     class Html < Ast::Visitor
       include ERB::Util # for the #h method
+      include Duration
 
       def initialize(step_mother, io, options)
         super(step_mother)
@@ -34,6 +36,7 @@ module Cucumber
           @builder.body do
             @builder.div(:class => 'cucumber') do
               super
+              @builder.div(format_duration(features.duration), :class => 'duration')
             end
           end
         end
@@ -45,6 +48,10 @@ module Cucumber
         end
       end
 
+      def visit_tag_name(tag_name)
+        @builder.span("@#{tag_name}", :class => 'tag')
+      end
+
       def visit_feature_name(name)
         lines = name.split(/\r?\n/)
         @builder.h2(lines[0])
@@ -63,6 +70,7 @@ module Cucumber
       end
 
       def visit_background_name(keyword, name, file_colon_line, source_indent)
+        @listing_background = true
         @builder.h3("#{keyword} #{name}")
       end
 
@@ -74,6 +82,7 @@ module Cucumber
       end
       
       def visit_scenario_name(keyword, name, file_colon_line, source_indent)
+        @listing_background = false
         @builder.h3("#{keyword} #{name}")
       end
 
@@ -102,21 +111,19 @@ module Cucumber
 
       def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
         @status = status
-        @builder.li(:id => @step_id, :class => status) do
+        @builder.li(:id => @step_id, :class => "step #{status}") do
           super(keyword, step_match, multiline_arg, status, exception, source_indent, background)
         end
       end
 
       def visit_step_name(keyword, step_match, status, source_indent, background)
         @step_matches ||= []
-        @skip_step = @step_matches.index(step_match)
+        background_in_scenario = background && !@listing_background
+        @skip_step = @step_matches.index(step_match) || background_in_scenario
         @step_matches << step_match
 
         unless @skip_step
-          step_name = step_match.format_args(lambda{|param| "<span>#{param}</span>"})
-          @builder.div do |div|
-            div << h("#{keyword} #{step_name}").gsub(/&lt;span&gt;/, '<span>').gsub(/&lt;\/span&gt;/, '</span>')
-          end
+          build_step(keyword, step_match, status)
         end
       end
 
@@ -163,15 +170,26 @@ module Cucumber
         cell_type = @outline_row == 0 ? :th : :td
         attributes = {:id => "#{@row_id}_#{@col_index}"}
         attributes[:class] = status if status
-        @builder.__send__(cell_type, value, attributes)
+        build_cell(cell_type, value, attributes)
         @col_index += 1
       end
-
+      
       def announce(announcement)
         @builder.pre(announcement, :class => 'announcement')
       end
 
-      private
+      protected
+      
+      def build_step(keyword, step_match, status)
+        step_name = step_match.format_args(lambda{|param| %{<span class="#{status}_param">#{param}</span>}})
+        @builder.div do |div|
+          div << h("#{keyword} #{step_name}").gsub(/&lt;span class=&quot;(.*?)&quot;&gt;/, '<span class="\1">').gsub(/&lt;\/span&gt;/, '</span>')
+        end
+      end
+      
+      def build_cell(cell_type, value, attributes)
+        @builder.__send__(cell_type, value, attributes)
+      end
 
       def inline_css
         @builder.style(:type => 'text/css') do
@@ -182,6 +200,7 @@ module Cucumber
       def format_exception(exception)
         (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
       end
+      
     end
   end
 end

data/lib/cucumber/formatter/pretty.rb

@@ -24,7 +24,7 @@ module Cucumber
 
       def visit_features(features)
         super
-        print_summary unless @options[:autoformat]
+        print_summary(features) unless @options[:autoformat]
       end
 
       def visit_feature(feature)
@@ -178,8 +178,8 @@ module Cucumber
 
       private
 
-      def print_summary
-        print_counts
+      def print_summary(features)
+        print_stats(features)
         print_snippets(@options)
         print_passing_wip(@options)
       end

data/lib/cucumber/formatter/profile.rb

@@ -27,7 +27,7 @@ module Cucumber
         end
       end
 
-      def print_summary
+      def print_summary(features)
         super
         @io.puts "\n\nTop #{NUMBER_OF_STEP_DEFINITONS_TO_SHOW} average slowest steps with #{NUMBER_OF_STEP_INVOCATIONS_TO_SHOW} slowest matches:\n"
 

data/lib/cucumber/formatter/progress.rb

@@ -15,7 +15,7 @@ module Cucumber
         super
         @io.puts
         @io.puts
-        print_summary
+        print_summary(features)
       end
 
       def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
@@ -30,10 +30,10 @@ module Cucumber
 
       private
 
-      def print_summary
+      def print_summary(features)
         print_steps(:pending)
         print_steps(:failed)
-        print_counts
+        print_stats(features)
         print_snippets(@options)
         print_passing_wip(@options)
       end

data/lib/cucumber/formatter/tag_cloud.rb

@@ -10,14 +10,14 @@ module Cucumber
 
       def visit_features(features)
         super
-        print_summary
+        print_summary(features)
       end
 
       def visit_tag_name(tag_name)
         @counts[tag_name] += 1
       end
   
-      def print_summary
+      def print_summary(features)
         matrix = @counts.to_a.sort{|paira, pairb| paira[0] <=> pairb[0]}.transpose
         table = Cucumber::Ast::Table.new(matrix)
         Cucumber::Formatter::Pretty.new(@step_mother, @io, {}).visit_multiline_arg(table)

data/lib/cucumber/formatter/usage.rb

@@ -16,7 +16,7 @@ module Cucumber
 
       def visit_features(features)
         super
-        print_summary
+        print_summary(features)
       end
 
       def visit_step(step)
@@ -37,7 +37,7 @@ module Cucumber
         end
       end
 
-      def print_summary
+      def print_summary(features)
         sorted_defs = @step_definitions.keys.sort_by{|step_definition| step_definition.backtrace_line}
         
         sorted_defs.each do |step_definition|