RubyGems - rspec-extra-formatters - Versions diffs - 0.1 → 0.2 - Mend

rspec-extra-formatters 0.1 → 0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

data/lib/rspec-extra-formatters/junit_formatter.rb +16 -6
data/spec/rspec-extra-formatters/junit_formatter_spec.rb +47 -21
data/spec/rspec-extra-formatters/tap_formatter_spec.rb +21 -17
metadata +1 -1

data/lib/rspec-extra-formatters/junit_formatter.rb CHANGED Viewed

@@ -69,14 +69,18 @@ class JUnitFormatter < RSpec::Core::Formatters::BaseFormatter
     output.puts("<testsuite errors=\"0\" failures=\"#{failure_count+pending_count}\" tests=\"#{example_count}\" time=\"#{duration}\" timestamp=\"#{Time.now.iso8601}\">")
     output.puts("  <properties />")
     @test_results[:successes].each do |t|
-      md      = t.metadata
-      runtime = md[:execution_result][:run_time]
-      output.puts("  <testcase classname=\"#{md[:file_path]}\" name=\"#{md[:full_description]}\" time=\"#{runtime}\" />")
+      md          = t.metadata
+      runtime     = md[:execution_result][:run_time]
+      description = _xml_escape(md[:full_description])
+      file_path   = _xml_escape(md[:file_path])
+      output.puts("  <testcase classname=\"#{file_path}\" name=\"#{description}\" time=\"#{runtime}\" />")
     end
     @test_results[:failures].each do |t|
-      md      = t.metadata
-      runtime = md[:execution_result][:run_time]
-      output.puts("  <testcase classname=\"#{md[:file_path]}\" name=\"#{md[:full_description]}\" time=\"#{runtime}\">")
+      md          = t.metadata
+      description = _xml_escape(md[:full_description])
+      file_path   = _xml_escape(md[:file_path])
+      runtime     = md[:execution_result][:run_time]
+      output.puts("  <testcase classname=\"#{file_path}\" name=\"#{description}\" time=\"#{runtime}\">")
       output.puts("    <failure message=\"failure\" type=\"failure\">")
       output.puts("<![CDATA[ #{read_failure(t)} ]]>")
       output.puts("    </failure>")
@@ -85,4 +89,10 @@ class JUnitFormatter < RSpec::Core::Formatters::BaseFormatter
     output.puts("</testsuite>")
   end
+  def _xml_escape(x)
+    x.gsub("&", "&amp;").
+      gsub("\"", "&quot;").
+      gsub(">", "&gt;").
+      gsub("<", "&lt;")
+  end
 end

data/spec/rspec-extra-formatters/junit_formatter_spec.rb CHANGED Viewed

@@ -26,22 +26,24 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+require "stringio"
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper.rb")
 describe JUnitFormatter do
   before(:each) do
-    @output = mock("output")
+    @now = Time.now
+    Time.stub(:now).and_return(@now)
   end
   it "should initialize the tests with failures and success" do
-    JUnitFormatter.new(@output).test_results.should eql({:failures=>[], :successes=>[]})
+    JUnitFormatter.new(StringIO.new).test_results.should eql({:failures=>[], :successes=>[]})
   end
   describe "example_passed" do
     it "should push the example obj into success list" do
-      f = JUnitFormatter.new(@output)
+      f = JUnitFormatter.new(StringIO.new)
       f.example_passed("foobar")
       f.test_results[:successes].should eql(["foobar"])
     end
@@ -51,7 +53,7 @@ describe JUnitFormatter do
   describe "example_failed" do
     it "should push the example obj into failures list" do
-      f = JUnitFormatter.new(@output)
+      f = JUnitFormatter.new(StringIO.new)
       f.example_failed("foobar")
       f.test_results[:failures].should eql(["foobar"])
     end
@@ -61,7 +63,7 @@ describe JUnitFormatter do
   describe "example_pending" do
     it "should do the same as example_failed" do
-      f = JUnitFormatter.new(@output)
+      f = JUnitFormatter.new(StringIO.new)
       f.example_pending("foobar")
       f.test_results[:failures].should eql(["foobar"])
     end
@@ -75,7 +77,7 @@ describe JUnitFormatter do
       example.should_receive(:metadata).exactly(2).times.and_return({:execution_result => { :exception_encountered => nil \
                                                                                           , :exception => nil \
                                                                                           }})
-      f = JUnitFormatter.new(@output)
+      f = JUnitFormatter.new(StringIO.new)
       f.read_failure(example).should eql("")
     end
@@ -89,7 +91,7 @@ describe JUnitFormatter do
                                                                                           , :exception => strace \
                                                                                           }})
-      f = JUnitFormatter.new(@output)
+      f = JUnitFormatter.new(StringIO.new)
       f.read_failure(example).should eql("foobar\nfoo\nbar")
     end
@@ -101,7 +103,7 @@ describe JUnitFormatter do
       example    = mock("example")
       example.should_receive(:metadata).exactly(2).times.and_return({:execution_result => {:exception_encountered => strace}})
-      f = JUnitFormatter.new(@output)
+      f = JUnitFormatter.new(StringIO.new)
       f.read_failure(example).should eql("foobar\nfoo\nbar")
     end
@@ -115,12 +117,12 @@ describe JUnitFormatter do
       strace.should_receive(:backtrace).and_return(["foo","bar"])
       example0 = mock("example-0")
-      example1 = mock("example-1")
       example0.should_receive(:metadata).and_return({ :full_description => "foobar-success" \
                                                     , :file_path        => "lib/foobar-s.rb" \
                                                     , :execution_result => { :run_time => 0.1 } \
                                                     })
+      example1 = mock("example-1")
       example1.should_receive(:metadata).exactly(3).times.and_return({ :full_description => "foobar-failure" \
                                                                      , :file_path        => "lib/foobar-f.rb" \
                                                                      , :execution_result => { :exception_encountered => strace \
@@ -128,21 +130,45 @@ describe JUnitFormatter do
                                                                                             }
                                                                      })
-      @output.should_receive(:puts).with("<?xml version=\"1.0\" encoding=\"utf-8\" ?>")
-      @output.should_receive(:puts).with("<testsuite errors=\"0\" failures=\"1\" tests=\"2\" time=\"0.1\" timestamp=\"#{Time.now.iso8601}\">")
-      @output.should_receive(:puts).with("  <properties />")
-      @output.should_receive(:puts).with("  <testcase classname=\"lib/foobar-s.rb\" name=\"foobar-success\" time=\"0.1\" />")
-      @output.should_receive(:puts).with("  <testcase classname=\"lib/foobar-f.rb\" name=\"foobar-failure\" time=\"0.1\">")
-      @output.should_receive(:puts).with("    <failure message=\"failure\" type=\"failure\">")
-      @output.should_receive(:puts).with("<![CDATA[ foobar\nfoo\nbar ]]>")
-      @output.should_receive(:puts).with("    </failure>")
-      @output.should_receive(:puts).with("  </testcase>")
-      @output.should_receive(:puts).with("</testsuite>")
-      f = JUnitFormatter.new(@output)
+      output = StringIO.new
+      f = JUnitFormatter.new(output)
       f.example_passed(example0)
       f.example_failed(example1)
       f.dump_summary("0.1", 2, 1, 0)
+      output.string.should == <<-EOF
+<?xml version="1.0" encoding="utf-8" ?>
+<testsuite errors="0" failures="1" tests="2" time="0.1" timestamp="#{@now.iso8601}">
+  <properties />
+  <testcase classname="lib/foobar-s.rb" name="foobar-success" time="0.1" />
+  <testcase classname="lib/foobar-f.rb" name="foobar-failure" time="0.1">
+    <failure message="failure" type="failure">
+<![CDATA[ foobar\nfoo\nbar ]]>
+    </failure>
+  </testcase>
+</testsuite>
+      EOF
+    end
+    it "should escape characteres <,>,&,\" before building xml" do
+      example0 = mock("example-0")
+      example0.should_receive(:metadata).and_return({ :full_description => "foobar-success >>> &\"& <<<" \
+                                                    , :file_path        => "lib/>foobar-s.rb" \
+                                                    , :execution_result => { :run_time => 0.1 } \
+                                                    })
+      output = StringIO.new
+      f = JUnitFormatter.new(output)
+      f.example_passed(example0)
+      f.dump_summary("0.1", 2, 1, 0)
+      output.string.should == <<-EOF
+<?xml version="1.0" encoding="utf-8" ?>
+<testsuite errors="0" failures="1" tests="2" time="0.1" timestamp="#{@now.iso8601}">
+  <properties />
+  <testcase classname="lib/&gt;foobar-s.rb" name="foobar-success &gt;&gt;&gt; &amp;&quot;&amp; &lt;&lt;&lt;" time="0.1" />
+</testsuite>
+      EOF
     end
   end

data/spec/rspec-extra-formatters/tap_formatter_spec.rb CHANGED Viewed

@@ -26,16 +26,13 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+require "stringio"
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper.rb")
 describe TapFormatter do
-  before(:each) do
-    @output = mock("output")
-  end
   it "should initialize the counter to 0" do
-    TapFormatter.new(@output).total.should eql(0)
+    TapFormatter.new(StringIO.new).total.should eql(0)
   end
   describe "example_passed" do
@@ -43,12 +40,13 @@ describe TapFormatter do
     it "should increment the counter and use the full_description attribute" do
       example = mock("example")
       example.should_receive(:metadata).and_return({:full_description => "foobar"})
-      @output.should_receive(:puts).with("ok 1 - foobar")
-      f = TapFormatter.new(@output)
+      output = StringIO.new
+      f = TapFormatter.new(output)
       f.example_passed(example)
       f.total.should eql(1)
+      output.string.should == "ok 1 - foobar\n"
     end
   end
@@ -58,12 +56,13 @@ describe TapFormatter do
     it "should increment the counter and use the full_description attribute" do
       example = mock("example")
       example.should_receive(:metadata).and_return({:full_description => "foobar"})
-      @output.should_receive(:puts).with("not ok 1 - foobar")
-      f = TapFormatter.new(@output)
+      output = StringIO.new
+      f = TapFormatter.new(output)
       f.example_failed(example)
       f.total.should eql(1)
+      output.string.should == "not ok 1 - foobar\n"
     end
   end
@@ -72,12 +71,13 @@ describe TapFormatter do
     it "should do the same as example_failed" do
       example = mock("example")
       example.should_receive(:metadata).and_return({:full_description => "foobar"})
-      @output.should_receive(:puts).with("not ok 1 - foobar")
-      f = TapFormatter.new(@output)
+      output = StringIO.new
+      f = TapFormatter.new(output)
       f.example_pending(example)
       f.total.should eql(1)
+      output.string.should == "not ok 1 - foobar\n"
     end
   end
@@ -89,16 +89,20 @@ describe TapFormatter do
       example.should_receive(:metadata).and_return({:full_description => "foobar"})
       example.should_receive(:metadata).and_return({:full_description => "foobar"})
       example.should_receive(:metadata).and_return({:full_description => "foobar"})
-      @output.should_receive(:puts).with("ok 1 - foobar")
-      @output.should_receive(:puts).with("not ok 2 - foobar")
-      @output.should_receive(:puts).with("not ok 3 - foobar")
-      @output.should_receive(:puts).with("1..3")
-      f = TapFormatter.new(@output)
+      output = StringIO.new
+      f = TapFormatter.new(output)
       f.example_passed(example)
       f.example_failed(example)
       f.example_pending(example)
       f.dump_summary(0.1, 3, 1, 1)
+      output.string.should == <<-EOF
+ok 1 - foobar
+not ok 2 - foobar
+not ok 3 - foobar
+1..3
+      EOF
     end
     it "should print nothing if there were not tests" do

metadata CHANGED Viewed

@@ -2,7 +2,7 @@
 name: rspec-extra-formatters
 version: !ruby/object:Gem::Version
   prerelease:
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors:
 - Diego Souza