test_notifier 0.3.2 → 0.3.3

data/lib/test_notifier/runner/autotest.rb

@@ -10,17 +10,23 @@ Autotest.add_hook :ran_command do |at|
     if rspec_matches
       _, examples, failures, _, pending = *rspec_matches
 
-      stats = TestNotifier::Stats.new(:spec, :total => examples, :fail => failures, :pending => pending)
+      stats = TestNotifier::Stats.new(:spec, {
+        :count    => examples,
+        :failures => failures,
+        :pending  => pending
+      })
+
       TestNotifier.notify(:status => stats.status, :message => stats.message) unless examples.to_i.zero?
     elsif test_unit_matches
       _, tests, assertions, failures, errors = *test_unit_matches
 
       stats = TestNotifier::Stats.new(:test_unit, {
-        :total => tests,
+        :count      => tests,
         :assertions => assertions,
-        :fail => failures,
-        :errors => errors
+        :failures   => failures,
+        :errors     => errors
       })
+
       TestNotifier.notify(:status => stats.status, :message => stats.message) unless tests.to_i.zero?
     end
   rescue

data/lib/test_notifier/runner/rspec.rb

@@ -9,11 +9,19 @@ class RSpec::Core::Formatters::BaseTextFormatter
 
     return if example_count.zero?
 
+    failure_filter = proc {|e|
+      e.instance_variable_get("@exception").class.name == "RSpec::Expectations::ExpectationNotMetError"
+    }
+
+    error_filter = proc {|e|
+      %w[RSpec::Expectations::ExpectationNotMetError NilClass].include?(e.instance_variable_get("@exception").class.name)
+    }
+
     stats = TestNotifier::Stats.new(:rspec, {
-      :total   => example_count,
-      :fail    => failure_count,
-      :pending => pending_count,
-      :errors  => examples.reject {|e| e.instance_variable_get("@exception").nil?}.count
+      :count    => example_count,
+      :failures => examples.select(&failure_filter).count,
+      :pending  => pending_count,
+      :errors   => examples.reject(&error_filter).count
     })
 
     TestNotifier.notify(:status => stats.status, :message => stats.message)

data/lib/test_notifier/runner/spec.rb

@@ -10,12 +10,12 @@ class Spec::Runner::Formatter::BaseTextFormatter
     return if example_count.zero?
 
     stats = TestNotifier::Stats.new(:spec, {
-      :total   => example_count,
-      :fail    => failure_count,
-      :pending => pending_count,
-      :error   => nil
+      :count    => example_count,
+      :failures => failure_count,
+      :pending  => pending_count,
+      :errors   => nil
     })
 
-    TestNotifier.notify(:status => stats.status, :message => stats.message) if example_count > 0
+    TestNotifier.notify(:status => stats.status, :message => stats.message)
   end
 end

data/lib/test_notifier/runner/test_unit.rb

@@ -13,7 +13,13 @@ class Test::Unit::UI::Console::TestRunner
       return if tests.to_i.zero?
 
 
-      stats = TestNotifier::Stats.new(:test_unit, :total => tests, :assertions => assertions, :fail => failures, :error => errors)
+      stats = TestNotifier::Stats.new(:test_unit, {
+        :count      => tests,
+        :assertions => assertions,
+        :failures   => failures,
+        :errors     => errors
+      })
+
       TestNotifier.notify(:status => stats.status, :message => stats.message)
     rescue
     end

data/lib/test_notifier/stats.rb

@@ -19,7 +19,7 @@ module TestNotifier
 
     private
     def normalize(options)
-      [:total, :success, :fail, :pending, :errors, :assertions].inject({}) do |buffer, key|
+      [:count, :success, :failures, :pending, :errors, :assertions].inject({}) do |buffer, key|
         buffer[key] = options[key].to_i
         buffer
       end
@@ -28,7 +28,7 @@ module TestNotifier
     def status_for_test_unit
       if options[:errors].nonzero?
         :error
-      elsif options[:fail].nonzero?
+      elsif options[:failures].nonzero?
         :fail
       else
         :success
@@ -38,7 +38,7 @@ module TestNotifier
     def status_for_rspec
       if options[:errors].nonzero?
         :error
-      elsif options[:fail].nonzero?
+      elsif options[:failures].nonzero?
         :fail
       else
         :success
@@ -46,7 +46,7 @@ module TestNotifier
     end
 
     def status_for_spec
-      if options[:fail].nonzero?
+      if options[:failures].nonzero?
         :fail
       else
         :success
@@ -54,12 +54,11 @@ module TestNotifier
     end
 
     def message_for_rspec
-      options[:success] = options[:total] - options[:fail]
-      options[:fail] =  options[:fail] - options[:errors]
+      options[:success] = options[:count] - (options[:failures] + options[:errors])
 
       text = []
-      text << "#{options[:total]} " + pluralize(options[:total], "example")
-      text << "#{options[:fail]} failed" unless options[:fail].zero?
+      text << "#{options[:count]} " + pluralize(options[:count], "example")
+      text << "#{options[:failures]} failed" unless options[:failures].zero?
       text << "#{options[:pending]} pending" unless options[:pending].zero?
       text << "#{options[:errors]} " + pluralize(options[:errors], "error") unless options[:errors].zero?
       text.join(", ")
@@ -67,17 +66,17 @@ module TestNotifier
 
     def message_for_spec
       text = []
-      text << "#{options[:total]} " + pluralize(options[:total], "example")
-      text << "#{options[:fail]} failed" unless options[:fail].zero?
+      text << "#{options[:count]} " + pluralize(options[:count], "example")
+      text << "#{options[:failures]} failed" unless options[:failures].zero?
       text << "#{options[:pending]} pending" unless options[:pending].zero?
       text.join(", ")
     end
 
     def message_for_test_unit
       text = []
-      text << "#{options[:total]} " + pluralize(options[:total], "test")
+      text << "#{options[:count]} " + pluralize(options[:count], "test")
       text << "#{options[:assertions]} " + pluralize(options[:assertions], "assertion")
-      text << "#{options[:fail]} failed" unless options[:fail].zero?
+      text << "#{options[:failures]} failed" unless options[:failures].zero?
       text << "#{options[:errors]} " + pluralize(options[:errors], "error") unless options[:errors].zero?
       text.join(", ")
     end

data/lib/test_notifier/version.rb

@@ -2,7 +2,7 @@ module TestNotifier
   module Version
     MAJOR = 0
     MINOR = 3
-    PATCH = 2
+    PATCH = 3
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/test/stats_test.rb

@@ -6,28 +6,28 @@ class TestNotifier::Stats::RSpecTest < Test::Unit::TestCase
   end
 
   test "success message" do
-    @stats.options = { :total => 10 }
+    @stats.options = { :count => 10 }
     assert_equal "10 examples", @stats.message
   end
 
   test "message with failing examples" do
-    @stats.options = { :total => 10, :fail => 5 }
+    @stats.options = { :count => 10, :failures => 5 }
     assert_equal "10 examples, 5 failed", @stats.message
   end
 
   test "message with pending examples" do
-    @stats.options = { :total => 10, :pending => 5 }
+    @stats.options = { :count => 10, :pending => 5 }
     assert_equal "10 examples, 5 pending", @stats.message
   end
 
   test "message with error examples" do
-    @stats.options = { :total => 10, :fail => 5, :errors => 5 }
-    assert_equal "10 examples, 5 errors", @stats.message
+    @stats.options = { :count => 10, :failures => 5, :errors => 5 }
+    assert_equal "10 examples, 5 failed, 5 errors", @stats.message
   end
 
   test "message with all types" do
-    @stats.options = { :total => 6, :fail => 3, :errors => 2, :pending => 3 }
-    assert_equal "6 examples, 1 failed, 3 pending, 2 errors", @stats.message
+    @stats.options = { :count => 6, :failures => 3, :errors => 2, :pending => 3 }
+    assert_equal "6 examples, 3 failed, 3 pending, 2 errors", @stats.message
   end
 end
 
@@ -37,22 +37,22 @@ class TestNotifier::Stats::SpecTest < Test::Unit::TestCase
   end
 
   test "success message" do
-    @stats.options = { :total => 10 }
+    @stats.options = { :count => 10 }
     assert_equal "10 examples", @stats.message
   end
 
   test "message with failing examples" do
-    @stats.options = { :total => 10, :fail => 5 }
+    @stats.options = { :count => 10, :failures => 5 }
     assert_equal "10 examples, 5 failed", @stats.message
   end
 
   test "message with pending examples" do
-    @stats.options = { :total => 10, :pending => 5 }
+    @stats.options = { :count => 10, :pending => 5 }
     assert_equal "10 examples, 5 pending", @stats.message
   end
 
   test "message with all types" do
-    @stats.options = { :total => 6, :fail => 2, :pending => 3 }
+    @stats.options = { :count => 6, :failures => 2, :pending => 3 }
     assert_equal "6 examples, 2 failed, 3 pending", @stats.message
   end
 end
@@ -63,22 +63,22 @@ class TestNotifier::Stats::TestUnitTest < Test::Unit::TestCase
   end
 
   test "success message" do
-    @stats.options = { :total => 10, :assertions => 20 }
+    @stats.options = { :count => 10, :assertions => 20 }
     assert_equal "10 tests, 20 assertions", @stats.message
   end
 
   test "message with failing examples" do
-    @stats.options = { :total => 10, :assertions => 20, :fail => 5 }
+    @stats.options = { :count => 10, :assertions => 20, :failures => 5 }
     assert_equal "10 tests, 20 assertions, 5 failed", @stats.message
   end
 
   test "message with error examples" do
-    @stats.options = { :total => 10, :assertions => 20, :errors => 5 }
+    @stats.options = { :count => 10, :assertions => 20, :errors => 5 }
     assert_equal "10 tests, 20 assertions, 5 errors", @stats.message
   end
 
   test "message with all types" do
-    @stats.options = { :total => 6, :fail => 2, :errors => 3, :assertions => 20 }
+    @stats.options = { :count => 6, :failures => 2, :errors => 3, :assertions => 20 }
     assert_equal "6 tests, 20 assertions, 2 failed, 3 errors", @stats.message
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: test_notifier
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Nando Vieira
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 -03:00
+date: 2010-08-30 00:00:00 -03:00
 default_executable: 
 dependencies: []