cucumber 0.8.6 → 0.8.7

data/lib/cucumber/formatter/cucumber.sass

@@ -1,247 +1,256 @@
 /* cucumber.css is generated from cucumber.sass */
 /* Regenerate with rake sass */
 
-$step_left: 5px solid
-$step_bottom: 1px solid
+!step_left        = 5px "solid"
+!step_bottom      = 1px "solid"
 
-$failed: #fffbd3
-$failed_border: #c20000
-$failed_text: #c20000
+!failed           = #FFFBD3
+!failed_border    = #C20000
+!failed_text      = #C20000
 
-$passed: #dbffb4
-$passed_border: #65c400
-$passed_text: #3d7700
+!passed           = #DBFFB4
+!passed_border    = #65C400
+!passed_text      = #3D7700
 
-$skipped: #e0ffff
-$skipped_border: aqua
-$skipped_text: #001111
+!skipped          = #E0FFFF
+!skipped_border   = #00FFFF
+!skipped_text     = #001111
 
-$pending: #fcfb98
-$pending_border: #faf834
-$pending_text: #131313
+!pending          = #FCFB98
+!pending_border   = #FAF834
+!pending_text     = #131313
 
-$undefined: #fcfb98
-$undefined_border: #faf834
-$undefined_text: #131313
-
-$message: #e0ffff
-$message_border: aqua
-$message_text: #001111
+!undefined        = #FCFB98
+!undefined_border = #FAF834
+!undefined_text   = #131313
 
 body
-  font-size: 0px
-  color: white
-  margin: 0px
-  padding: 0px
+  :font-size 0px
+  :color #FFFFFF
+  :margin 0px
+  :padding 0px
 
 .cucumber,td,th
-  font: normal 11px "Lucida Grande", Helvetica, sans-serif
-  background: white
-  color: black
+  :font normal 11px "Lucida Grande", Helvetica, sans-serif
+  :background white
+  :color #000000
+  
   #cucumber-header
-    background: #65c400
-    color: white
-    height: 6em
+    :background #65C400
+    :color #FFFFFF
+    :height 6em
+    
     #expand-collapse
       p
-        float: right
-        margin: 0 0 0 10px
+        :float right
+        :margin 0 0 0 10px
+    
   .scenario
     h3
-      font-size: 11px
-      padding: 3px
-      margin: 0
-      background: #65c400
-      color: white
-      font-weight: bold
+      :font-size 11px
+      :padding 3px
+      :margin 0
+      :background #65C400
+      :color #FFFFFF
+      :font-weight bold
+  
   h1
-    margin: 0px 10px 0px 10px
-    padding: 10px
-    font-family: "Lucida Grande", Helvetica, sans-serif
-    font-size: 2em
-    position: absolute
+    :margin 0px 10px 0px 10px
+    :padding 10px
+    :font-family "Lucida Grande", Helvetica, sans-serif
+    :font-size 2em
+    :position absolute
+  
   h4
-    margin-bottom: 2px
+    :margin-bottom 2px
+
   div.feature
-    padding: 2px
-    margin: 0px 10px 5px 10px
+    :padding 2px
+    :margin 0px 10px 5px 10px
+
   div.examples
-    padding: 0em 0em 0em 1em
+    :padding 0em 0em 0em 1em
+
   .stats
-    margin: 2em
+    :margin 2em
+
   .summary
     ul.features
       li
-        display: inline
+        :display inline
+   
   .step_name
-    float: left
+    :float left
+        
   .step_file
-    text-align: right
-    color: #999999
+    :text-align right
+    :color #999999
     a
-      color: #999999
-  .scenario_file
-    float: right
-    color: #999999
+      :color #999999
+    
+
   .tag
-    font-weight: bold
-    color: #246ac1
+    :font-weight bold
+    :color #246AC1
+    
   .backtrace
-    margin-top: 0
-    margin-bottom: 0
-    margin-left: 1em
-    color: black
+    :margin-top 0
+    :margin-bottom 0
+    :margin-left 1em
+    :color #000000
+
   a
-    text-decoration: none
-    color: #be5c00
+    :text-decoration none
+    :color #BE5C00
+
     &:hover
-      text-decoration: underline
+      :text-decoration underline
     &:visited
-      font-weight: normal
+      :font-weight normal
+
     div.examples
-      margin: 5px 0px 5px 15px
-      color: black
+      :margin 5px 0px 5px 15px
+      :color #000000
+      
   .outline
     table
-      margin: 0px 0px 5px 10px
+      :margin 0px 0px 5px 10px
+
   table
-    border-collapse: collapse
+    :border-collapse collapse
     td
-      padding: 3px 3px 3px 5px
+      :padding 3px 3px 3px 5px
     td.failed, td.passed, td.skipped, td.pending, td.undefined
-      padding-left: 18px
-      padding-right: 10px
+      :padding-left 18px
+      :padding-right 10px
     td.failed
-      border-left: $step_left $failed_border
-      border-bottom: $step_bottom $failed_border
-      background: $failed
-      color: $failed_text
+      :border-left= !step_left !failed_border
+      :border-bottom= !step_bottom !failed_border
+      :background= !failed
+      :color= !failed_text
     td.passed
-      border-left: $step_left $passed_border
-      border-bottom: $step_bottom $passed_border
-      background: $passed
-      color: $passed_text
+      :border-left= !step_left !passed_border
+      :border-bottom= !step_bottom !passed_border
+      :background= !passed
+      :color= !passed_text
     td.skipped
-      border-left: $step_left $skipped_border
-      border-bottom: $step_bottom $skipped_border
-      background: $skipped
-      color: $skipped_text
+      :border-left= !step_left !skipped_border
+      :border-bottom= !step_bottom !skipped_border
+      :background= !skipped
+      :color= !skipped_text
     td.pending
-      border-left: $step_left $pending_border
-      border-bottom: $step_bottom $pending_border
-      background: $pending
-      color: $pending_text
+      :border-left= !step_left !pending_border
+      :border-bottom= !step_bottom !pending_border
+      :background= !pending
+      :color= !pending_text
     td.undefined
-      border-left: $step_left $undefined_border
-      border-bottom: $step_bottom $undefined_border
-      background: $undefined
-      color: $undefined_text
-    td.message
-      border-left: $step_left $message_border
-      border-bottom: $step_bottom $message_border
-      background: $message
-      color: $message_text
+      :border-left= !step_left !undefined_border
+      :border-bottom= !step_bottom !undefined_border
+      :background= !undefined
+      :color= !undefined_text
+
   ol
-    list-style: none
-    margin: 0px
-    padding: 0px
+    :list-style none
+    :margin 0px
+    :padding 0px
+    
     li.step
-      padding: 3px 3px 3px 18px
-      margin: 5px 0px 5px 5px
+      :padding 3px 3px 3px 18px
+      :margin 5px 0px 5px 5px
     li
-      margin: 0em 0em 0em 1em
-      padding: 0em 0em 0em 0.2em
+      :margin 0em 0em 0em 1em
+      :padding 0em 0em 0em 0.2em        
       span.param
-        font-weight: bold
+        :font-weight bold      
     li.failed
-      border-left: $step_left $failed_border
-      border-bottom: $step_bottom $failed_border
-      background: $failed
-      color: $failed_text
+      :border-left= !step_left !failed_border
+      :border-bottom= !step_bottom !failed_border
+      :background= !failed
+      :color= !failed_text
     li.passed
-      border-left: $step_left $passed_border
-      border-bottom: $step_bottom $passed_border
-      background: $passed
-      color: $passed_text
+      :border-left= !step_left !passed_border
+      :border-bottom= !step_bottom !passed_border
+      :background= !passed
+      :color= !passed_text
     li.skipped
-      border-left: $step_left $skipped_border
-      border-bottom: $step_bottom $skipped_border
-      background: $skipped
-      color: $skipped_text
+      :border-left= !step_left !skipped_border
+      :border-bottom= !step_bottom !skipped_border
+      :background= !skipped
+      :color= !skipped_text
     li.pending
-      border-left: $step_left $pending_border
-      border-bottom: $step_bottom $pending_border
-      background: $pending
-      color: $pending_text
+      :border-left= !step_left !pending_border
+      :border-bottom= !step_bottom !pending_border
+      :background= !pending
+      :color= !pending_text
     li.undefined
-      border-left: $step_left $undefined_border
-      border-bottom: $step_bottom $undefined_border
-      background: $undefined
-      color: $undefined_text
-    li.message
-      border-left: $step_left $message_border
-      border-bottom: $step_bottom $message_border
-      background: $message
-      color: $message_text
-      margin-left: 10px
+      :border-left= !step_left !undefined_border
+      :border-bottom= !step_bottom !undefined_border
+      :background= !undefined
+      :color= !undefined_text
+            
   #summary
-    margin: 0px
-    padding: 5px 10px
-    text-align: right
-    top: 0px
-    right: 0px
-    float: right
+    :margin 0px
+    :padding 5px 10px
+    :text-align right
+    :top 0px
+    :right 0px
+    :float right
+
     p
-      margin: 0 0 0 2px
-    #totals
-      font-size: 1.2em
+      :margin 0 0 0 2px
 
+    #totals
+      :font-size 1.2em      
+      
 .ruby
-  font-size: 12px
-  font-family: monospace
-  color: white
-  background: black
-  padding: 0.1em 0 0.2em 0
-  .keyword
-    color: #ff6600
+  :font-size 12px
+  :font-family monospace
+  :color white
+  :background black
+  :padding 0.1em 0 0.2em 0
+
+  .keyword 
+    :color #FF6600
   .constant
-    color: #339999
+    :color #339999
   .attribute
-    color: white
+    :color white
   .global
-    color: white
+    :color white
   .module
-    color: white
+    :color white
   .class
-    color: white
+    :color white
   .string
-    color: #66ff00
+    :color #66FF00
   .ident
-    color: white
+    :color white
   .method
-    color: #ffcc00
+    :color #FFCC00
   .number
-    color: white
+    :color white
   .char
-    color: white
+    :color white
   .comment
-    color: #9933cc
+    :color #9933CC
   .symbol
-    color: white
+    :color white
   .regex
-    color: #44b4cc
+    :color #44B4CC
   .punct
-    color: white
+    :color white
   .escape
-    color: white
-  .interp
-    color: white
-  .expr
-    color: white
+    :color white
+  .interp 
+    :color white
+  .expr 
+    :color white
+
   .offending
-    background: #333333
+    :background #333333
   .linenum
-    width: 75px
-    padding: 0.1em 1em 0.2em 0
-    color: black
-    background: #fffbd3
+    :width 75px
+    :padding 0.1em 1em 0.2em 0
+    :color #000000
+    :background #FFFBD3
+

data/lib/cucumber/formatter/html.rb

@@ -20,23 +20,20 @@ module Cucumber
         @scenario_number = 0
         @step_number = 0
         @header_red = nil
-        @delayed_messages = []
-        @img_id = 0
       end
 
-      def embed(src, mime_type, label)
+      def embed(file, mime_type)
         case(mime_type)
         when /^image\/(png|gif|jpg|jpeg)/
-          embed_image(src, label)
+          embed_image(file)
         end
       end
 
-      def embed_image(src, label)
-        id = "img_#{@img_id}"
-        @img_id += 1
+      def embed_image(file)
+        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="#{src}"/>}
+          pre << %{<a href="" onclick="img=document.getElementById('#{id}'); img.style.display = (img.style.display == 'none' ? 'block' : 'none');return false">Screenshot</a><br>&nbsp;
+          <img id="#{id}" style="display: none" src="#{file}"/>}
         end
       end
 
@@ -166,9 +163,6 @@ module Cucumber
       end
 
       def scenario_name(keyword, name, file_colon_line, source_indent)
-        @builder.span(:class => 'scenario_file') do
-          @builder << file_colon_line
-        end
         @listing_background = false
         @builder.h3(:id => "scenario_#{@scenario_number}") do
           @builder.span(keyword + ':', :class => 'keyword')
@@ -251,7 +245,6 @@ module Cucumber
           end
         end
         @builder << '</li>'
-        print_messages
       end
 
       def step_name(keyword, step_match, status, source_indent, background)
@@ -288,7 +281,7 @@ module Cucumber
         end
       end
 
-      def doc_string(string)
+      def py_string(string)
         return if @hide_this_step
         @builder.pre(:class => 'val') do |pre|
           @builder << string.gsub("\n", '&#x000A;')
@@ -305,7 +298,6 @@ module Cucumber
   
       def after_table_row(table_row)
         return if @hide_this_step
-        print_table_row_messages
         @builder << '</tr>'
         if table_row.exception
           @builder.tr do
@@ -335,35 +327,8 @@ module Cucumber
         @col_index += 1
       end
 
-      def puts(message)
-        @delayed_messages << message
-        #@builder.pre(message, :class => 'message')
-      end
-      
-      def print_messages
-        return if @delayed_messages.empty?
-        
-        #@builder.ol do
-          @delayed_messages.each do |ann|
-            @builder.li(:class => 'step message') do
-              @builder << ann
-            end
-          end
-        #end
-        empty_messages
-      end
-      
-      def print_table_row_messages
-        return if @delayed_messages.empty?
-        
-        @builder.td(:class => 'message') do
-          @builder << @delayed_messages.join(", ")
-        end
-        empty_messages
-      end
-      
-      def empty_messages
-        @delayed_messages = []
+      def announce(announcement)
+        @builder.pre(announcement, :class => 'announcement')
       end
 
       protected
@@ -393,7 +358,7 @@ module Cucumber
       end
 
       def set_scenario_color(status)
-        if status == :undefined or status == :pending
+        if status == :undefined
           set_scenario_color_pending
         end
         if status == :failed
@@ -558,7 +523,7 @@ module Cucumber
       end
 
       def backtrace_line(line)
-        line.gsub(/\A([^:]*\.(?:rb|feature|haml)):(\d*).*\z/) do
+        line.gsub(/^([^:]*\.(?:rb|feature|haml)):(\d*)/) do
           if ENV['TM_PROJECT_DIRECTORY']
             "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
           else