aslakhellesoy-cucumber 0.3.93.1 → 0.3.94

data/lib/cucumber/formatter/html.rb

@@ -1,10 +1,4 @@
-require 'erb'
-begin
-  require 'builder'
-rescue LoadError
-  gem 'builder'
-  require 'builder'
-end
+require 'cucumber/formatter/ordered_xml_markup'
 require 'cucumber/formatter/duration'
 
 module Cucumber
@@ -20,7 +14,7 @@ module Cucumber
       end
       
       def create_builder(io)
-        Builder::XmlMarkup.new(:target => io, :indent => 0)
+        OrderedXmlMarkup.new(:target => io, :indent => 0)
       end
       
       def visit_features(features)

data/lib/cucumber/formatter/junit.rb

@@ -1,9 +1,4 @@
-begin
-  require 'builder'
-rescue LoadError
-  gem 'builder'
-  require 'builder'
-end
+require 'cucumber/formatter/ordered_xml_markup'
 
 module Cucumber
   module Formatter
@@ -18,16 +13,18 @@ module Cucumber
 
       def visit_feature(feature)
         @failures = @errors = @tests = 0
-        @builder = Builder::XmlMarkup.new( :indent => 2 )
+        @builder = OrderedXmlMarkup.new( :indent => 2 )
+        @time = 0
         super
 
-        @testsuite = Builder::XmlMarkup.new( :indent => 2 )
+        @testsuite = OrderedXmlMarkup.new( :indent => 2 )
         @testsuite.instruct!
         @testsuite.testsuite(
           :failures => @failures,
           :errors => @errors,
           :tests => @tests,
-          :name => @feature_name ) do
+          :time => "%.6f" % @time,
+        :name => @feature_name ) do
           @testsuite << @builder.target!
         end
 
@@ -36,40 +33,84 @@ module Cucumber
         File.open(feature_filename, 'w') { |file| file.write(@testsuite.target!) }
       end
 
+      def visit_background(name)
+        @in_background = true
+        super
+        @in_background = false
+      end
+
       def visit_feature_name(name)
         lines = name.split(/\r?\n/)
         @feature_name = lines[0].sub(/Feature\:/, '').strip
       end
 
       def visit_scenario_name(keyword, name, file_colon_line, source_indent)
-        @scenario = name
+        scenario_name = name.strip
+        scenario_name = "Unnamed scenario" if name == ""
+        @scenario = scenario_name
+        @outline = keyword.include?('Scenario Outline')
+        @output = "Scenario#{ " outline" if @outline}: #{@scenario}\n\n"
       end
 
       def visit_steps(steps)
-        @steps_failed = false
+        return if @in_background
+        start = Time.now
         super
-        @failures += 1 if @steps_failed
-        @tests += 1
+        duration = Time.now - start
+        unless @outline
+          if steps.failed?
+            steps.each { |step| @output += "#{step.keyword} #{step.name}\n" }
+            @output += "\nMessage:\n"
+          end
+          build_testcase(duration, steps.status, steps.exception)
+        end
+      end
+
+      def visit_outline_table(outline_table)
+        @header_row = true
+        super(outline_table)
       end
 
-      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
-        step_name = keyword + " " + step_match.format_args(lambda{|param| "*#{param}*"})
-        @builder.testcase(:classname => "#{@feature_name}.#{@scenario}", :name => step_name) do
-          if status != :passed
-            @builder.failure(:message => step_name) do
-              @builder.text!(format_exception(exception)) if exception
+      def visit_table_row(table_row)
+        if @outline
+          start = Time.now
+          super(table_row)
+          duration = Time.now - start
+          unless @header_row
+            name_suffix = " (outline example : #{table_row.name})"
+            if table_row.failed?
+              @output += "Example row: #{table_row.name}\n"
+              @output += "\nMessage:\n"
             end
-            @steps_failed = true
+            build_testcase(duration, table_row.status, table_row.exception,  name_suffix)
           end
+        else
+          super(table_row)
         end
+        @header_row = false
       end
 
       private
 
-      def format_exception(exception)
-        (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
-      end
-    end
+        def build_testcase(duration, status, exception = nil, suffix = "")
+          @time += duration
+          classname = "#{@feature_name}.#{@scenario}"
+          name = "#{@scenario}#{suffix}"
+          @builder.testcase(:classname => classname, :name => name, :time => "%.6f" % duration) do
+            if status != :passed
+              @builder.failure(:message => "#{status.to_s} #{name}", :type => status.to_s) do
+                @builder.text! @output
+                @builder.text!(format_exception(exception)) if exception
+              end
+              @failures += 1
+            end
+          end
+          @tests += 1
+        end
 
+        def format_exception(exception)
+          (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
+        end
+    end
   end
 end

data/lib/cucumber/formatter/pretty.rb

@@ -48,14 +48,14 @@ module Cucumber
       end
 
       def visit_comment_line(comment_line)
-        @io.puts(comment_line.indent(@indent)) 
+        @io.puts(comment_line.indent(@indent))
         @io.flush
       end
 
       def visit_tags(tags)
         tags.accept(self)
         if @indent == 1
-          @io.puts 
+          @io.puts
           @io.flush
         end
       end
@@ -74,6 +74,7 @@ module Cucumber
       end
 
       def visit_feature_element(feature_element)
+        record_tag_occurrences(feature_element, @options)
         @indent = 2
         @scenario_indent = 2
         super
@@ -160,7 +161,7 @@ module Cucumber
         super
         @io.puts
         if table_row.exception && !@exceptions.index(table_row.exception)
-          print_exception(table_row.exception, :failed, @indent) 
+          print_exception(table_row.exception, :failed, @indent)
         end
       end
 
@@ -187,7 +188,10 @@ module Cucumber
       end
 
       private
-      
+      def cell_prefix(status)
+        @prefixes[status]
+      end
+
       def cell_prefix(status)
         @prefixes[status]
       end
@@ -196,6 +200,7 @@ module Cucumber
         print_stats(features)
         print_snippets(@options)
         print_passing_wip(@options)
+        print_tag_limit_warnings(@options)
       end
 
     end

data/lib/cucumber/formatter/progress.rb

@@ -18,6 +18,11 @@ module Cucumber
         print_summary(features)
       end
 
+      def visit_feature_element(feature_element)
+        record_tag_occurrences(feature_element, @options)
+        super
+      end
+
       def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
         progress(status)
         @status = status
@@ -36,6 +41,7 @@ module Cucumber
         print_stats(features)
         print_snippets(@options)
         print_passing_wip(@options)
+        print_tag_limit_warnings(@options)
       end
 
       CHARS = {
@@ -51,7 +57,7 @@ module Cucumber
         @io.print(format_string(char, status))
         @io.flush
       end
-      
+
       def table_header_cell?(status)
         status == :skipped_param
       end

data/lib/cucumber/rake/task.rb

@@ -8,8 +8,8 @@ module Cucumber
     #
     #   Cucumber::Rake::Task.new
     #
-    # This will create a task named 'features' described as 'Run Features with 
-    # Cucumber'. It will use steps from 'features/**/*.rb' and features in 'features/**/*.feature'.
+    # This will create a task named 'cucumber' described as 'Run Cucumber features'. 
+    # It will use steps from 'features/**/*.rb' and features in 'features/**/*.feature'.
     #
     # To further configure the task, you can pass a block:
     #
@@ -148,7 +148,7 @@ module Cucumber
       end
 
       # Define Cucumber Rake task
-      def initialize(task_name = "features", desc = "Run Features with Cucumber")
+      def initialize(task_name = "cucumber", desc = "Run Cucumber features")
         @task_name, @desc = task_name, desc
         @fork = true
         @libs = ['lib']

data/lib/cucumber/step_mother.rb

@@ -127,7 +127,9 @@ module Cucumber
     end
 
     # Registers a new StepDefinition. This method is aliased
-    # to <tt>Given</tt>, <tt>When</tt> and <tt>Then</tt>.
+    # to <tt>Given</tt>, <tt>When</tt> and <tt>Then</tt>, and
+    # also to the i18n translations whenever a feature of a
+    # new language is loaded.
     #
     # See Cucumber#alias_steps for details on how to
     # create your own aliases.

data/lib/cucumber/version.rb

@@ -2,8 +2,8 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 93
-    PATCH = 1 # Set to nil for official release
+    TINY  = 94
+    PATCH = nil # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/rails_generators/cucumber/templates/cucumber.rake

@@ -4,15 +4,27 @@ unless ARGV.any? {|a| a =~ /^gems/}
 
 begin
   require 'cucumber/rake/task'
+  namespace :cucumber do
+    Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
+      t.fork = true # You may get faster startup if you set this to false
+      t.cucumber_opts = "--tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}<%= spork? ? ' --drb' : '' %>"
+    end
 
-  Cucumber::Rake::Task.new(:features) do |t|
-    t.fork = true
-    t.cucumber_opts = [<%= options[:spork] ? "'--drb', " : "" %>'--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
+    Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
+      t.fork = true # You may get faster startup if you set this to false
+      t.cucumber_opts = "--tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}<%= spork? ? ' --drb' : '' %>"
+    end
+
+    desc 'Run all features'
+    task :all => [:ok, :wip]
+  end
+
+  task :features => 'cucumber:ok' do
+    STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
   end
-  task :features => 'db:test:prepare'
 rescue LoadError
-  desc 'Cucumber rake task not available'
-  task :features do
+  desc 'cucumber rake task not available (cucumber not installed)'
+  task :cucumber do
     abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
   end
 end

data/spec/cucumber/ast/scenario_outline_spec.rb

@@ -47,7 +47,7 @@ module Cucumber
               ]
             ]
           ]
-          
+
         )
       end
 
@@ -59,7 +59,7 @@ module Cucumber
 
       it "should pretty print" do
         require 'cucumber/formatter/pretty'
-        visitor = Formatter::Pretty.new(@step_mother, STDOUT, {:comment => true})
+        visitor = Formatter::Pretty.new(@step_mother, STDOUT, {:comment => true, :include_tags => {}, :exclude_tags => {}})
         visitor.visit_feature_element(@scenario_outline)
       end
     end

data/spec/cucumber/ast/table_spec.rb

@@ -101,6 +101,11 @@ module Cucumber
         table2.hashes.first[:three].should == '4444'
       end
 
+      it "should allow renaming columns using regexp" do
+        table2 = @table.map_headers(/one|uno/ => :three)
+        table2.hashes.first[:three].should == '4444'
+      end
+
       it "should copy column mappings when mapping headers" do
         @table.map_column!('one') { |v| v.to_i }
         table2 = @table.map_headers('one' => 'three')

data/spec/cucumber/cli/configuration_spec.rb

@@ -361,7 +361,8 @@ END_OF_MESSAGE
 
     it "should accept --no-color option" do
       Term::ANSIColor.should_receive(:coloring=).with(false)
-      config.parse!(%w[--no-color])
+      config = Configuration.new(StringIO.new)
+      config.parse!(['--no-color'])
     end
 
     describe "--backtrace" do

data/spec/cucumber/cli/options_spec.rb

@@ -87,10 +87,10 @@ module Cli
 
       context '-t TAGS --tags TAGS' do
         it "removes the @ prefix" do
-          after_parsing('-t @foo,bar') { options[:include_tags].should == ['foo','bar'] }
+          after_parsing('-t @foo,bar') { options[:include_tags].should == {'foo' => nil, 'bar' => nil} }
         end
         it "designates tags prefixed with ~ as tags to be excluded" do
-          after_parsing('--tags ~@foo,bar') { options[:exclude_tags].should == ['foo'] }
+          after_parsing('--tags ~@foo,bar') { options[:exclude_tags].should == {'foo' => nil} }
         end
       end
 
@@ -157,13 +157,13 @@ module Cli
         it "combines the include_tags of both" do
           given_cucumber_yml_defined_as('baz' => %w[-t bar])
           options.parse!(%w[--tags foo -p baz])
-          options[:include_tags].should == %w[foo bar]
+          options[:include_tags].should == {'foo' => nil, 'bar' => nil}
         end
 
         it "combines the exclude_tags of both" do
           given_cucumber_yml_defined_as('baz' => %w[-t ~bar])
           options.parse!(%w[--tags ~foo -p baz])
-          options[:exclude_tags].should == %w[foo bar]
+          options[:exclude_tags].should == {'foo' => nil, 'bar' => nil}
         end
 
         it "only takes the paths from the original options, and disgregards the profiles" do
@@ -269,8 +269,6 @@ module Cli
           options[:paths].should == ['my_feature.feature']
         end
       end
-
-
     end
 
     describe '#expanded_args_without_drb' do
@@ -295,6 +293,13 @@ module Cli
         options.expanded_args_without_drb.should == %w[features FOO=bar]
       end
 
+      it "ignores the paths from the profiles if one was specified on the command line" do
+        given_cucumber_yml_defined_as('foo' => 'features --drb')
+        options.parse!(%w[some_feature.feature -p foo])
+        options.expanded_args_without_drb.should == %w[some_feature.feature]
+      end
+
+
 
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.93.1
+  version: 0.3.94
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-03 00:00:00 -07:00
+date: 2009-08-06 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency