Merge 4fd01ff into 09b0ae4

cucumber · May 20, 2015 · ace7e65 · ace7e65
2 parents 09b0ae4 + 4fd01ff
commit ace7e65
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/features/docs/formatters/html_formatter.feature b/features/docs/formatters/html_formatter.feature
@@ -88,3 +88,4 @@ Feature: HTML output formatter
     """
     makeRed('background_0')
     """
+
diff --git a/lib/cucumber/formatter/legacy_api/ast.rb b/lib/cucumber/formatter/legacy_api/ast.rb
@@ -60,6 +60,7 @@ def accept(formatter)
             comments.each do |comment|
               formatter.comment_line comment.to_s.strip
             end
+            formatter.after_comment comments
           end
         end
 

diff --git a/spec/cucumber/formatter/html_spec.rb b/spec/cucumber/formatter/html_spec.rb
@@ -40,7 +40,7 @@ module Formatter
 
         describe "with a step that embeds a snapshot" do
           define_steps do
-            Given(/snap/) { 
+            Given(/snap/) {
               RSpec::Mocks.allow_message(File, :file?) { true }
               embed('out/snapshot.jpeg', 'image/jpeg')
             }
@@ -87,7 +87,14 @@ module Formatter
 
           it { expect(@out.string).to match(/^\<!DOCTYPE/) }
           it { expect(@out.string).to match(/\<\/html\>$/) }
-          it { expect(@doc).to have_css_node('.feature .comment', /Healthy/) }
+
+          it "nests the comment within the feature" do
+            expect(@doc).to have_css_node('.feature .comment', /Healthy/)
+          end
+
+          it "properly closes the comment" do
+            expect(@out.string).to match(%r{<pre class="comment"># Healthy<br/></pre>})
+          end
         end
 
         describe "with a tag" do
@@ -315,7 +322,7 @@ module Formatter
 
         describe "with a step that embeds a snapshot" do
           define_steps do
-            Given(/snap/) { 
+            Given(/snap/) {
               RSpec::Mocks.allow_message(File, :file?) { true }
               embed('snapshot.jpeg', 'image/jpeg')
             }
@@ -329,7 +336,7 @@ module Formatter
 
           it { expect(@doc.css('.embed img').first.attributes['src'].to_s).to eq "snapshot.jpeg" }
         end
-        
+
         describe "with a step that embeds a text" do
           define_steps do
             Given(/log/) { embed('log.txt', 'text/plain') }