yarjuf 1.0.3 → 1.0.4

data/HISTORY.txt

@@ -2,4 +2,11 @@
 - Initial release
 
 1.0.1
-- Fixing incompatibility with rspec 2.12
+- Bug in RSpec 2.12 needs coding around
+
+1.0.2
+- Added dependency on the 'builder' gem
+
+1.0.3
+- Bug fix in RSpec 2.12.1 means we can go back to how it was before 1.0.1
+

data/lib/yarjuf.rb

@@ -3,6 +3,9 @@ require 'builder'
 require 'rspec/core/formatters/base_formatter'
 
 class JUnit < RSpec::Core::Formatters::BaseFormatter
+
+  #rspec formatter methods we care about
+
   def initialize(output)
     super output
     @test_suite_results = {}
@@ -20,6 +23,14 @@ class JUnit < RSpec::Core::Formatters::BaseFormatter
     add_to_test_suite_results(example)
   end
 
+  def dump_summary(duration, example_count, failure_count, pending_count)
+    builder = Builder::XmlMarkup.new :indent => 2
+    build_results builder, duration, example_count, failure_count, pending_count
+    output.puts builder.target!
+  end
+
+  protected
+
   def add_to_test_suite_results(example)
     suite_name = root_group_name_for(example)
     @test_suite_results[suite_name] = [] unless @test_suite_results.keys.include?(suite_name)
@@ -27,17 +38,13 @@ class JUnit < RSpec::Core::Formatters::BaseFormatter
   end
 
   def root_group_name_for(example)
-    group_hierarchy_for(example).first[:description]
-  end
-
-  def group_hierarchy_for(example)
     group_hierarchy = []
     current_example_group = example.metadata[:example_group]
     until current_example_group.nil? do
       group_hierarchy.unshift current_example_group
       current_example_group = current_example_group[:example_group]
     end
-    group_hierarchy
+    group_hierarchy.first[:description]
   end
 
   def failure_details_for(example)
@@ -45,36 +52,39 @@ class JUnit < RSpec::Core::Formatters::BaseFormatter
     exception.nil? ? "" : "#{exception.message}\n#{format_backtrace(exception.backtrace, example).join("\n")}"
   end
 
-  def fail_count_for_suite(suite)
-    suite.select {|example| example.metadata[:execution_result][:status] == "failed"}.size
+  def count_in_suite_of_type(suite, test_case_result_type)
+    suite.select {|example| example.metadata[:execution_result][:status] == test_case_result_type}.size
   end
 
-  def skipped_count_for_suite(suite)
-    suite.select {|example| example.metadata[:execution_result][:status] == "pending"}.size
-  end
+  #methods to build the xml for test suites and individual tests
 
-  def dump_summary(duration, example_count, failure_count, pending_count)
-    builder = Builder::XmlMarkup.new :indent => 2
+  def build_results(builder, duration, example_count, failure_count, pending_count)
     builder.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
     builder.testsuites :errors => 0, :failures => failure_count, :skipped => pending_count, :tests => example_count, :time => duration, :timestamp => Time.now.iso8601 do
-      @test_suite_results.each do |suite_name, tests|
-        builder.testsuite :name => suite_name, :tests => tests.size, :errors => 0, :failures => fail_count_for_suite(tests), :skipped => skipped_count_for_suite(tests) do
-          builder.properties
-          tests.each do |test|
-            builder.testcase :name => test.metadata[:full_description], :time => test.metadata[:execution_result][:run_time] do
-              case test.metadata[:execution_result][:status]
-              when "pending" then builder.skipped
-              when "failed"
-                builder.failure :message => "failed #{test.metadata[:full_description]}", :type => "failed" do
-                  builder.cdata! failure_details_for test
-                end
-              end
-            end
-          end
-        end
+      @test_suite_results.each {|suite_name, tests| build_test_suite builder, suite_name, tests}
+    end
+  end
+
+  def build_test_suite(builder, suite_name, tests)
+    builder.testsuite :name => suite_name, :tests => tests.size, :errors => 0, :failures => count_in_suite_of_type(tests, "failed"), :skipped => count_in_suite_of_type(tests, "pending") do
+      builder.properties
+      tests.each {|test| build_test builder, test}
+    end
+  end
+
+  def build_test(builder, test)
+    builder.testcase :name => test.metadata[:full_description], :time => test.metadata[:execution_result][:run_time] do
+      case test.metadata[:execution_result][:status]
+      when "pending" then builder.skipped
+      when "failed" then build_failed_test builder, test
       end
     end
-  output.puts builder.target!
+  end
+
+  def build_failed_test(builder, test)
+    builder.failure :message => "failed #{test.metadata[:full_description]}", :type => "failed" do
+      builder.cdata! failure_details_for test
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yarjuf
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec