cucumber 0.10.3 → 0.10.5

data/legacy_features/junit_formatter.feature

@@ -132,4 +132,33 @@ can't convert .* into String \(TypeError\)
     And STDERR should match
       """
 You \*must\* specify \-\-out DIR for the junit formatter
-      """
+      """
+
+  Scenario: one feature, one scenario outline, two examples: one passing, one failing
+    When I run cucumber --format junit --out tmp/ features/scenario_outline.feature
+    Then it should fail with
+      """
+
+      """
+    And "fixtures/junit/tmp/TEST-scenario_outline.xml" with junit duration "0.005" should contain
+      """
+      <?xml version="1.0" encoding="UTF-8"?>
+      <testsuite errors="0" failures="1" name="Scenario outlines" skipped="0" tests="2" time="0.005">
+      <testcase classname="Scenario outlines.Using scenario outlines" name="Using scenario outlines (outline example : | passing |)" time="0.005">
+      </testcase>
+      <testcase classname="Scenario outlines.Using scenario outlines" name="Using scenario outlines (outline example : | failing |)" time="0.005">
+        <failure message="failed Using scenario outlines (outline example : | failing |)" type="failed">
+          <![CDATA[Scenario Outline: Using scenario outlines
+      
+      Example row: | failing |
+      
+      Message:
+      ]]>
+          <![CDATA[ (RuntimeError)
+      features/scenario_outline.feature:4:in `Given a <type> scenario']]>
+        </failure>
+      </testcase>
+      </testsuite>
+
+      """
+  

data/legacy_features/profiles.feature

@@ -4,7 +4,7 @@ Feature: Profiles
   These named arguments are called profiles and the yml file should be in the root of your project.
   Any cucumber argument is valid in a profile.  To see all the available flags type 'cucumber --help'
   For more information about profiles please see the wiki:
-  http://wiki.github.com/aslakhellesoy/cucumber/cucumberyml
+  http://wiki.github.com/cucumber/cucumber/cucumber.yml
 
   Background: Basic App
     Given a standard Cucumber project directory structure

data/legacy_features/step_definitions/cucumber_steps.rb

@@ -78,6 +78,10 @@ Then /^it should (fail|pass) with$/ do |success, output|
   Then("it should #{success}")
 end
 
+Then /^the output should contain "([^"]*)"$/ do |text|
+  last_stdout.should include(text)
+end
+
 Then /^the output should contain:?$/ do |text|
   last_stdout.should include(text)
 end

data/lib/cucumber/ast.rb

@@ -9,7 +9,7 @@ require 'cucumber/ast/step_collection'
 require 'cucumber/ast/step'
 require 'cucumber/ast/table'
 require 'cucumber/ast/tags'
-require 'cucumber/ast/py_string'
+require 'cucumber/ast/doc_string'
 require 'cucumber/ast/outline_table'
 require 'cucumber/ast/examples'
 require 'cucumber/ast/visitor'

data/lib/cucumber/ast/{py_string.rb → doc_string.rb}

@@ -8,7 +8,7 @@ module Cucumber
     #     Cucumber sandwich
     #     """
     #
-    # The text between the pair of <tt>"""</tt> is stored inside a PyString,
+    # The text between the pair of <tt>"""</tt> is stored inside a DocString,
     # which is yielded to the StepDefinition block as the last argument.
     #
     # The StepDefinition can then access the String via the #to_s method. In the
@@ -16,7 +16,7 @@ module Cucumber
     #
     # Note how the indentation from the source is stripped away.
     #
-    class PyString #:nodoc:
+    class DocString #:nodoc:
       class Builder
         attr_reader :string
 
@@ -24,7 +24,7 @@ module Cucumber
           @string = ''
         end
 
-        def py_string(string, line_number)
+        def doc_string(string, line_number)
           @string = string
         end
 
@@ -55,7 +55,7 @@ module Cucumber
 
       def accept(visitor)
         return if Cucumber.wants_to_quit
-        visitor.visit_py_string(@string)
+        visitor.visit_doc_string(@string)
       end
       
       def arguments_replaced(arguments) #:nodoc:
@@ -64,7 +64,7 @@ module Cucumber
           value ||= ''
           string = string.gsub(name, value)
         end
-        PyString.new(string)
+        DocString.new(string)
       end
 
       def has_text?(text)
@@ -73,7 +73,7 @@ module Cucumber
 
       # For testing only
       def to_sexp #:nodoc:
-        [:py_string, to_step_definition_arg]
+        [:doc_string, to_step_definition_arg]
       end
     end
   end

data/lib/cucumber/ast/tree_walker.rb

@@ -122,7 +122,7 @@ module Cucumber
         broadcast(exception, status)
       end
 
-      def visit_py_string(string)
+      def visit_doc_string(string)
         broadcast(string)
       end
 
@@ -142,9 +142,9 @@ module Cucumber
         broadcast(value, status)
       end
 
-      # Print +announcement+. This method can be called from within StepDefinitions.
-      def announce(announcement)
-        broadcast(announcement)
+      # Print +messages+. This method can be called from within StepDefinitions.
+      def puts(*messages)
+        broadcast(*messages)
       end
 
       # Embed +file+ of +mime_type+ in the formatter. This method can be called from within StepDefinitions.

data/lib/cucumber/formatter/console.rb

@@ -26,9 +26,9 @@ module Cucumber
         format_string(line, status)
       end
 
-      def format_string(string, status)
+      def format_string(o, status)
         fmt = format_for(status)
-        string.split("\n").map do |line|
+        o.to_s.split("\n").map do |line|
           if Proc === fmt
             fmt.call(line)
           else
@@ -131,39 +131,41 @@ module Cucumber
         # no-op
       end
 
-      #define @delayed_announcements = [] in your Formatter if you want to
+      #define @delayed_messages = [] in your Formatter if you want to
       #activate this feature
-      def announce(announcement)
-        if @delayed_announcements
-          @delayed_announcements << announcement
+      def puts(*messages)
+        if @delayed_messages
+          @delayed_messages += messages
         else
           if @io
             @io.puts
-            @io.puts(format_string(announcement, :tag))
+            messages.each do |message|
+              @io.puts(format_string(message, :tag))
+            end
             @io.flush
           end
         end
       end
 
-      def print_announcements()
-        @delayed_announcements.each {|ann| print_announcement(ann)}
-        empty_announcements
+      def print_messages
+        @delayed_messages.each {|message| print_message(message)}
+        empty_messages
       end
 
-      def print_table_row_announcements
-        return if @delayed_announcements.empty?
-        @io.print(format_string(@delayed_announcements.join(', '), :tag).indent(2))
+      def print_table_row_messages
+        return if @delayed_messages.empty?
+        @io.print(format_string(@delayed_messages.join(', '), :tag).indent(2))
         @io.flush
-        empty_announcements
+        empty_messages
       end
 
-      def print_announcement(announcement)
-        @io.puts(format_string(announcement, :tag).indent(@indent))
+      def print_message(message)
+        @io.puts(format_string(message, :tag).indent(@indent))
         @io.flush
       end
 
-      def empty_announcements
-        @delayed_announcements = []
+      def empty_messages
+        @delayed_messages = []
       end
 
     private

data/lib/cucumber/formatter/cucumber.css

@@ -133,7 +133,7 @@ body {
   background: #fcfb98;
   color: #131313;
 }
-.cucumber table td.announcement, td table td.announcement, th table td.announcement {
+.cucumber table td.message, td table td.message, th table td.message {
   border-left: 5px solid aqua;
   border-bottom: 1px solid aqua;
   background: #e0ffff;
@@ -185,7 +185,7 @@ body {
   background: #fcfb98;
   color: #131313;
 }
-.cucumber ol li.announcement, td ol li.announcement, th ol li.announcement {
+.cucumber ol li.message, td ol li.message, th ol li.message {
   border-left: 5px solid aqua;
   border-bottom: 1px solid aqua;
   background: #e0ffff;

data/lib/cucumber/formatter/cucumber.sass

@@ -24,9 +24,9 @@ $undefined: #fcfb98
 $undefined_border: #faf834
 $undefined_text: #131313
 
-$announcement: #e0ffff
-$announcement_border: aqua
-$announcement_text: #001111
+$message: #e0ffff
+$message_border: aqua
+$message_text: #001111
 
 body
   font-size: 0px
@@ -136,11 +136,11 @@ body
       border-bottom: $step_bottom $undefined_border
       background: $undefined
       color: $undefined_text
-    td.announcement
-      border-left: $step_left $announcement_border
-      border-bottom: $step_bottom $announcement_border
-      background: $announcement
-      color: $announcement_text
+    td.message
+      border-left: $step_left $message_border
+      border-bottom: $step_bottom $message_border
+      background: $message
+      color: $message_text
   ol
     list-style: none
     margin: 0px
@@ -178,11 +178,11 @@ body
       border-bottom: $step_bottom $undefined_border
       background: $undefined
       color: $undefined_text
-    li.announcement
-      border-left: $step_left $announcement_border
-      border-bottom: $step_bottom $announcement_border
-      background: $announcement
-      color: $announcement_text
+    li.message
+      border-left: $step_left $message_border
+      border-bottom: $step_bottom $message_border
+      background: $message
+      color: $message_text
       margin-left: 10px
   #summary
     margin: 0px

data/lib/cucumber/formatter/html.rb

@@ -20,21 +20,21 @@ module Cucumber
         @scenario_number = 0
         @step_number = 0
         @header_red = nil
-        @delayed_announcements = []
+        @delayed_messages = []
       end
 
-      def embed(file, mime_type, label)
+      def embed(src, mime_type, label)
         case(mime_type)
         when /^image\/(png|gif|jpg|jpeg)/
-          embed_image(file, label)
+          embed_image(src, label)
         end
       end
 
-      def embed_image(file, label)
+      def embed_image(src, label)
         id = file.hash
         @builder.span(:class => 'embed') do |pre|
           pre << %{<a href="" onclick="img=document.getElementById('#{id}'); img.style.display = (img.style.display == 'none' ? 'block' : 'none');return false">#{label}</a><br>&nbsp;
-          <img id="#{id}" style="display: none" src="#{file}"/>}
+          <img id="#{id}" style="display: none" src="#{src}"/>}
         end
       end
 
@@ -249,7 +249,7 @@ module Cucumber
           end
         end
         @builder << '</li>'
-        print_announcements
+        print_messages
       end
 
       def step_name(keyword, step_match, status, source_indent, background)
@@ -286,7 +286,7 @@ module Cucumber
         end
       end
 
-      def py_string(string)
+      def doc_string(string)
         return if @hide_this_step
         @builder.pre(:class => 'val') do |pre|
           @builder << string.gsub("\n", '&#x000A;')
@@ -303,7 +303,7 @@ module Cucumber
   
       def after_table_row(table_row)
         return if @hide_this_step
-        print_table_row_announcements
+        print_table_row_messages
         @builder << '</tr>'
         if table_row.exception
           @builder.tr do
@@ -333,35 +333,35 @@ module Cucumber
         @col_index += 1
       end
 
-      def announce(announcement)
-        @delayed_announcements << announcement
-        #@builder.pre(announcement, :class => 'announcement')
+      def puts(message)
+        @delayed_messages << message
+        #@builder.pre(message, :class => 'message')
       end
       
-      def print_announcements
-        return if @delayed_announcements.empty?
+      def print_messages
+        return if @delayed_messages.empty?
         
         #@builder.ol do
-          @delayed_announcements.each do |ann|
-            @builder.li(:class => 'step announcement') do
+          @delayed_messages.each do |ann|
+            @builder.li(:class => 'step message') do
               @builder << ann
             end
           end
         #end
-        empty_announcements
+        empty_messages
       end
       
-      def print_table_row_announcements
-        return if @delayed_announcements.empty?
+      def print_table_row_messages
+        return if @delayed_messages.empty?
         
-        @builder.td(:class => 'announcement') do
-          @builder << @delayed_announcements.join(", ")
+        @builder.td(:class => 'message') do
+          @builder << @delayed_messages.join(", ")
         end
-        empty_announcements
+        empty_messages
       end
       
-      def empty_announcements
-        @delayed_announcements = []
+      def empty_messages
+        @delayed_messages = []
       end
 
       protected

data/lib/cucumber/formatter/junit.rb

@@ -26,6 +26,10 @@ module Cucumber
         @time = 0
       end
       
+      def before_feature_element(feature_element)
+        @in_examples = Ast::ScenarioOutline === feature_element
+      end
+      
       def after_feature(feature)
         @testsuite = OrderedXmlMarkup.new( :indent => 2 )
         @testsuite.instruct!
@@ -92,7 +96,7 @@ module Cucumber
       end
 
       def after_table_row(table_row)
-        return unless @in_examples
+        return unless @in_examples and Cucumber::Ast::OutlineTable::ExampleRow === table_row
         duration = Time.now - @table_start
         unless @header_row
           name_suffix = " (outline example : #{table_row.name})"

data/lib/cucumber/formatter/pdf.rb

@@ -28,9 +28,9 @@ module Cucumber
         @file = ensure_file(path_or_io, "pdf")
 
         if(options[:dry_run])
-          @status_colors = { :passed => BLACK, :skipped => BLACK, :undefined => BLACK, :failed => BLACK, :announced => GREY}
+          @status_colors = { :passed => BLACK, :skipped => BLACK, :undefined => BLACK, :failed => BLACK, :putsd => GREY}
         else
-          @status_colors = { :passed => '055902', :skipped => GREY, :undefined => 'F27405', :failed => '730202', :announced => GREY}
+          @status_colors = { :passed => '055902', :skipped => GREY, :undefined => 'F27405', :failed => '730202', :putsd => GREY}
         end
 
         @pdf = Prawn::Document.new
@@ -71,9 +71,9 @@ module Cucumber
         end
       end
 
-      def announce(announcement)
-        @pdf.fill_color(@status_colors[:announced])  
-        @pdf.text announcement, :size => 10
+      def puts(message)
+        @pdf.fill_color(@status_colors[:putsd])  
+        @pdf.text message, :size => 10
         @pdf.fill_color BLACK
       end
 
@@ -172,7 +172,7 @@ module Cucumber
         end
       end
 
-      def before_py_string(string)
+      def before_doc_string(string)
         return if @hide_this_step
         s = %{"""\n#{string}\n"""}.indent(10)
         s = s.split("\n").map{|l| l =~ /^\s+$/ ? '' : l}

data/lib/cucumber/formatter/pretty.rb

@@ -25,7 +25,7 @@ module Cucumber
         @exceptions = []
         @indent = 0
         @prefixes = options[:prefixes] || {}
-        @delayed_announcements = []
+        @delayed_messages = []
       end
 
       def after_features(features)
@@ -101,7 +101,7 @@ module Cucumber
       end
       
       def examples_name(keyword, name)
-        puts unless @visiting_first_example_name
+        @io.puts unless @visiting_first_example_name
         @visiting_first_example_name = false
         names = name.strip.empty? ? [name.strip] : name.split("\n")
         @io.puts("    #{keyword}: #{names[0]}")
@@ -150,10 +150,10 @@ module Cucumber
         source_indent = nil unless @options[:source]
         name_to_report = format_step(keyword, step_match, status, source_indent)
         @io.puts(name_to_report.indent(@scenario_indent + 2))
-        print_announcements
+        print_messages
       end
 
-      def py_string(string)
+      def doc_string(string)
         return if @hide_this_step
         s = %{"""\n#{string}\n"""}.indent(@indent)
         s = s.split("\n").map{|l| l =~ /^\s+$/ ? '' : l}.join("\n")
@@ -184,7 +184,7 @@ module Cucumber
 
       def after_table_row(table_row)
         return if !@table || @hide_this_step
-        print_table_row_announcements
+        print_table_row_messages
         @io.puts
         if table_row.exception && !@exceptions.include?(table_row.exception)
           print_exception(table_row.exception, table_row.status, @indent)