cucumber 0.3.11 → 0.3.90

data/lib/cucumber/formatter/cucumber.sass

@@ -1,39 +1,49 @@
 # cucumber.css is generated from cucumber.sass
-# Regenerate with the following command:
-#
-#   sass -t expanded lib/cucumber/formatter/cucumber.sass > lib/cucumber/formatter/cucumber.css
-#
-.cucumber
-  :background black
-  :color white
-  :padding 1em
+# Regenerate with rake sass
 
-  .passed
-    :color green
-  .undefined
-    :color yellow
-  .pending
-    :color yellow
-  .failed
-    :color red
-  .skipped
-    :color cyan
-  .outline
-    :color cyan
-  .param
-    :font-weight bold
+!step_left   = 5px solid
+!step_bottom = 1px solid
 
-  a
-    :text-decoration none
-    :color inherit
+!failed         = #FFC0CB
+!failed_dark    = #FF0000
+!failed_text    = #8B0000
 
-    &:hover
-      :text-decoration underline
-    &:visited
-      :font-weight normal
+!passed         = #98FB98
+!passed_dark    = #00FF00
+!passed_text    = #001111
 
-  ol
-    :list-style none
+!skipped        = #E0FFFF
+!skipped_dark   = #00FFFF
+!skipped_text   = #001111
+
+!pending        = #FFFF00
+!pending_dark   = #FF8000
+!pending_text   = #2A1B0A
+
+!undefined      = #FFFF00
+!undefined_dark = #FF8000
+!undefined_text = #2A1B0A
+
+.cucumber
+  :font-family "Lucida Grande", Helvetica, sans-serif
+  :font-size 0.7em
+  :background white
+  :padding 1em
+  
+  h1, h2, h3, h4, ol, li, pre, p
+    :font-size 1em
+    :padding 0px
+    :margin 0px
+
+  div.feature
+    :border 1px solid 
+    :padding 2px
+    :margin 4px
+
+    div.background, div.scenario, p
+      :padding 0em 0em 0em 1em
+      div.examples
+        :padding 0em 0em 0em 1em
 
   .stats
     :margin 2em
@@ -47,3 +57,83 @@
     :margin-top 0
     :margin-bottom 0
     :margin-left 1em
+
+  a
+    :text-decoration none
+    :color inherit
+
+    &:hover
+      :text-decoration underline
+    &:visited
+      :font-weight normal
+
+    div.examples
+      :border 1px solid 
+      :padding 2px
+      :margin 4px
+
+  table
+    :border-collapse collapse
+    
+    td, th
+      :font-size 0.7em
+      :border 1px solid #AAAAAA
+    td.failed
+      :background #FFC0CB
+      :color #8B0000
+    td.passed
+      :background #98FB98
+      :color= !passed_text
+    td.skipped
+      :background= !skipped
+      :color= !skipped_text
+    td.pending
+      :background #FFFFE0
+      :color #111100
+    td.undefined
+      :background #FFFFE0
+      :color #111100
+
+  ol
+    :list-style none
+  
+    li
+      :margin 0em 0em 0em 1em
+      :padding 0em 0em 0em 0.2em
+      span.param
+        :font-weight bold
+    li.failed
+      :border-left= !step_left !failed_dark
+      :border-bottom= !step_bottom !failed_dark
+      :background= !failed
+      :color= !failed_text
+      span.param
+        :background !failed_dark
+    li.passed
+      :border-left= !step_left !passed_dark
+      :border-bottom= !step_bottom !passed_dark
+      :background= !passed
+      :color= !passed_text
+      span.param
+        :background= !passed_dark
+    li.skipped
+      :border-left= !step_left !skipped_dark
+      :border-bottom= !step_bottom !skipped_dark
+      :background= !skipped
+      :color= !skipped_text
+      span.param
+        :background= !skipped_dark
+    li.pending
+      :border-left= !step_left !pending_dark
+      :border-bottom= !step_bottom !pending_dark
+      :background= !pending
+      :color= !pending_text
+      span.param
+        :background= !pending_dark
+    li.undefined
+      :border-left= !step_left !undefined_dark
+      :border-bottom= !step_bottom !undefined_dark
+      :background= !undefined
+      :color= !undefined_text
+      span.param
+        :background= !undefined_dark

data/lib/cucumber/formatter/html.rb

@@ -20,7 +20,7 @@ module Cucumber
       end
       
       def create_builder(io)
-        Builder::XmlMarkup.new(:target => io, :indent => 2)
+        Builder::XmlMarkup.new(:target => io, :indent => 0)
       end
       
       def visit_features(features)
@@ -54,7 +54,8 @@ module Cucumber
       end
 
       def visit_comment_line(comment_line)
-        @builder.text!(comment_line.strip + "\n")
+        @builder.text!(comment_line)
+        @builder.br
       end
 
       def visit_feature(feature)
@@ -73,7 +74,7 @@ module Cucumber
         @builder.h2 do |h2|
           @builder.span(lines[0], :class => 'val')
         end
-        @builder.p do
+        @builder.p(:class => 'narrative') do
           lines[1..-1].each do |line|
             @builder.text!(line.strip)
             @builder.br
@@ -191,7 +192,7 @@ module Cucumber
 
       def visit_py_string(string)
         @builder.pre(:class => 'val') do |pre|
-          @builder.text!(string)
+          @builder.text!('  ' + string)
         end
       end
 
@@ -213,7 +214,7 @@ module Cucumber
         @outline_row += 1 if @outline_row
       end
 
-      def visit_table_cell_value(value, width, status)
+      def visit_table_cell_value(value, status)
         cell_type = @outline_row == 0 ? :th : :td
         attributes = {:id => "#{@row_id}_#{@col_index}", :class => 'val'}
         attributes[:class] += " #{status}" if status

data/lib/cucumber/formatter/junit.rb

@@ -31,13 +31,14 @@ module Cucumber
           @testsuite << @builder.target!
         end
 
-        File.open(@feature_filename, 'w') { |file| file.write(@testsuite.target!) }
+        basename = File.basename(feature.file)[0...-File.extname(feature.file).length]
+        feature_filename = File.join(@reportdir, "TEST-#{basename}.xml")
+        File.open(feature_filename, 'w') { |file| file.write(@testsuite.target!) }
       end
 
       def visit_feature_name(name)
         lines = name.split(/\r?\n/)
         @feature_name = lines[0].sub(/Feature\:/, '').strip
-        @feature_filename = convert_to_file_name(@feature_name)
       end
 
       def visit_scenario_name(keyword, name, file_colon_line, source_indent)
@@ -65,10 +66,6 @@ module Cucumber
 
       private
 
-      def convert_to_file_name(feature_name)
-        File.join(@reportdir, "TEST-" + feature_name.gsub(/[^\w_\.]/, '_') + ".xml")
-      end
-
       def format_exception(exception)
         (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
       end

data/lib/cucumber/formatter/pretty.rb

@@ -13,13 +13,13 @@ module Cucumber
       include Console
       attr_writer :indent
 
-      def initialize(step_mother, io, options, delim='|')
+      def initialize(step_mother, io, options)
         super(step_mother)
         @io = io
         @options = options
-        @delim = delim
         @exceptions = []
         @indent = 0
+        @prefixes = options[:prefixes] || {}
       end
 
       def visit_features(features)
@@ -48,10 +48,8 @@ module Cucumber
       end
 
       def visit_comment_line(comment_line)
-        unless comment_line.blank?
-          @io.puts(comment_line.indent(@indent)) 
-          @io.flush
-        end
+        @io.puts(comment_line.indent(@indent)) 
+        @io.flush
       end
 
       def visit_tags(tags)
@@ -147,6 +145,7 @@ module Cucumber
 
       def visit_multiline_arg(multiline_arg)
         return if @options[:no_multiline]
+        @table = multiline_arg
         super
       end
 
@@ -156,7 +155,8 @@ module Cucumber
       end
 
       def visit_table_row(table_row)
-        @io.print @delim.indent(@indent)
+        @col_index = 0
+        @io.print '  |'.indent(@indent-2)
         super
         @io.puts
         if table_row.exception && !@exceptions.index(table_row.exception)
@@ -171,13 +171,26 @@ module Cucumber
         @io.flush
       end
 
-      def visit_table_cell_value(value, width, status)
+      def visit_table_cell(cell)
+        super
+        @col_index += 1
+      end
+
+      def visit_table_cell_value(value, status)
         status ||= @status || :passed
-        @io.print(' ' + format_string((value.to_s || '').ljust(width), status) + ::Term::ANSIColor.reset(" #{@delim}"))
+        width = @table.col_width(@col_index)
+        cell_text = value.to_s || ''
+        padded = cell_text + (' ' * (width - cell_text.jlength))
+        prefix = cell_prefix(status)
+        @io.print(' ' + format_string("#{prefix}#{padded}", status) + ::Term::ANSIColor.reset(" |"))
         @io.flush
       end
 
       private
+      
+      def cell_prefix(status)
+        @prefixes[status]
+      end
 
       def print_summary(features)
         print_stats(features)

data/lib/cucumber/formatter/profile.rb

@@ -17,7 +17,7 @@ module Cucumber
         super
       end
 
-      def visit_step_name(keyword, step_match, status, source_indent, background)
+      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
         duration = Time.now - @step_duration
         super
 

data/lib/cucumber/formatter/progress.rb

@@ -23,7 +23,7 @@ module Cucumber
         @status = status
       end
 
-      def visit_table_cell_value(value, width, status)
+      def visit_table_cell_value(value, status)
         status ||= @status
         progress(status) unless table_header_cell?(status)
       end

data/lib/cucumber/formatter/steps.rb

@@ -0,0 +1,49 @@
+module Cucumber
+  module Formatter
+    class Steps < Ast::Visitor
+
+      def initialize(step_mother, io, options)
+        super(step_mother)
+        @io = io
+        @options = options
+        @step_definition_files = collect_steps(step_mother)
+      end
+
+      def visit_features(features)
+        print_summary
+      end
+
+      private
+
+      def print_summary
+        count = 0
+        @step_definition_files.keys.sort.each do |step_definition_file|
+          @io.puts step_definition_file
+          
+          sources = @step_definition_files[step_definition_file]
+          source_indent = source_indent(sources)
+          sources.sort.each do |file_colon_line, regexp|
+            @io.print "#{regexp}".indent(2)
+            @io.print " # #{file_colon_line}".indent(source_indent - regexp.size)
+            @io.puts
+          end
+          @io.puts
+          count += sources.size
+        end
+        @io.puts "#{count} step definition(s) in #{@step_definition_files.size} source file(s)."
+      end
+
+      def collect_steps(step_mother)
+        step_mother.step_definitions.inject({}) do |step_definitions, step_definition|
+          step_definitions[step_definition.file] ||= []
+          step_definitions[step_definition.file] << [ step_definition.file_colon_line, step_definition.regexp.inspect ]
+          step_definitions
+        end
+      end
+
+      def source_indent(sources)
+        sources.map { |file_colon_line, regexp| regexp.size }.max + 1
+      end
+    end
+  end
+end

data/lib/cucumber/languages.yml

@@ -91,14 +91,14 @@
   native: Česky
   encoding: UTF-8
   feature: Požadavek
-  background: Pozadí
+  background: Pozadí|Kontext
   scenario: Scénář
-  scenario_outline: Náčrt Scénáře
+  scenario_outline: Náčrt Scénáře|Osnova scénáře
   examples: Příklady
   given: Pokud
   when: Když
   then: Pak
-  and: A
+  and: A|A také
   but: Ale
   space_after_keyword: true
 "da":

data/lib/cucumber/parser.rb

@@ -3,36 +3,4 @@ require 'cucumber/platform'
 require 'cucumber/ast'
 require 'cucumber/parser/treetop_ext'
 require 'cucumber/parser/table'
-
-module Cucumber
-  # Classes in this module parse feature files and translate the parse tree 
-  # (concrete syntax tree) into an abstract syntax tree (AST) using
-  # <a href="http://martinfowler.com/dslwip/EmbeddedTranslation.html">Embedded translation</a>.
-  #
-  # The AST is built by the various <tt>#build</tt> methods in the parse tree.
-  #
-  # The AST classes are defined in the Cucumber::Ast module.
-  module Parser
-    def self.load_parser(keywords)
-      Loader.new(keywords)
-    end
-    
-    class Loader
-      def initialize(keywords)
-        @keywords = keywords
-        i18n_tt = File.expand_path(File.dirname(__FILE__) + '/parser/i18n.tt')
-        template = File.open(i18n_tt, Cucumber.file_mode('r')).read
-        erb = ERB.new(template)
-        grammar = erb.result(binding)
-        Treetop.load_from_string(grammar)
-        require 'cucumber/parser/feature'
-      end
-
-      def keywords(key, raw=false)
-        return @keywords[key] if raw
-        values = @keywords[key].split('|')
-        values.map{|value| "'#{value}'"}.join(" / ")
-      end
-    end
-  end
-end
+require 'cucumber/parser/feature'

data/lib/cucumber/parser/feature.rb

@@ -10,17 +10,13 @@ module Cucumber
       include Treetop::Runtime
 
       def root
-        @root || :feature
+        @root || :feature_sub
       end
 
-      include I18n
-
-      include Table
-
-      module Feature0
+      module FeatureSub0
       end
 
-      module Feature1
+      module FeatureSub1
         def white
           elements[0]
         end
@@ -55,10 +51,14 @@ module Cucumber
 
       end
 
-      module Feature2
+      module FeatureSub2
         def has_tags?(tag_names)
           tags.has_tags?(tag_names)
         end
+
+        def has_all_tags?(tag_names)
+          tags.has_all_tags?(tag_names)
+        end
         
         def build(filter)
           if(filter.nil? || feature_elements.accept?(filter) || (!bg.empty? && filter.accept?(bg)))
@@ -74,10 +74,10 @@ module Cucumber
         end
       end
 
-      def _nt_feature
+      def _nt_feature_sub
         start_index = index
-        if node_cache[:feature].has_key?(index)
-          cached = node_cache[:feature][index]
+        if node_cache[:feature_sub].has_key?(index)
+          cached = node_cache[:feature_sub][index]
           @index = cached.interval.end if cached
           return cached
         end
@@ -139,7 +139,7 @@ module Cucumber
                     end
                     if s7.last
                       r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
-                      r7.extend(Feature0)
+                      r7.extend(FeatureSub0)
                     else
                       self.index = i7
                       r7 = nil
@@ -181,14 +181,14 @@ module Cucumber
         end
         if s0.last
           r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(Feature1)
-          r0.extend(Feature2)
+          r0.extend(FeatureSub1)
+          r0.extend(FeatureSub2)
         else
           self.index = i0
           r0 = nil
         end
 
-        node_cache[:feature][start_index] = r0
+        node_cache[:feature_sub][start_index] = r0
 
         return r0
       end
@@ -215,6 +215,10 @@ module Cucumber
           ts.elements.detect{|e| e.tag.line == line}
         end
 
+        def has_all_tags?(tags)
+          (tags & tag_names) == tags
+        end
+
         def has_tags?(tags)
           (tag_names & tags).any?
         end
@@ -495,6 +499,11 @@ module Cucumber
           feature_tags.has_tags?(tag_names)
         end
 
+        def has_all_tags?(tag_names)
+          feature_tags = self.parent.tags
+          feature_tags.has_all_tags?(tag_names)
+        end
+
         def build
           Ast::Background.new(
             comment.build, 
@@ -692,6 +701,11 @@ module Cucumber
           tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
         end
 
+        def has_all_tags?(tag_names)
+          feature_tags = self.parent.parent.tags
+          tags.has_all_tags?(tag_names) || feature_tags.has_all_tags?(tag_names)
+        end
+
         def matches_name?(regexp_to_match)
           name.build =~ regexp_to_match
         end
@@ -830,6 +844,11 @@ module Cucumber
           tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
         end
 
+        def has_all_tags?(tag_names)
+          feature_tags = self.parent.parent.tags
+          tags.has_all_tags?(tag_names) || feature_tags.has_all_tags?(tag_names)
+        end
+
         def matches_name?(regexp_to_match)
           outline_matches_name?(regexp_to_match) || examples_sections.matches_name?(regexp_to_match)
         end
@@ -1166,6 +1185,10 @@ module Cucumber
           true
         end
 
+        def has_all_tags?(tag_names)
+          true
+        end
+
         def outline_at_line?(line)
           true
         end
@@ -1346,7 +1369,7 @@ module Cucumber
 
       module LinesToKeyword2
         def build
-          self.text_value.split("\n").map{|s| s.strip }.join("\n")
+          self.text_value.split("\n").map{|s| s.strip}.join("\n")
         end
       end