on 0.3.0 → 0.3.1

data/lib/on/test_helper.rb

@@ -32,6 +32,18 @@ class On
   #       on.call :success, :some, :args
   #       assert_callback recorder, :success, :some, :args
   #     end
+  #
+  #     it "checks record args in a block" do
+  #       on = On.new(:success, :failure) do |result|
+  #         recorder.record_block
+  #         recorder.record_callback(result, :success, :failure)
+  #       end
+  #       on.call :success, :some, :args
+  #       assert_callback recorder, :success do |some, args|
+  #         assert_equal :some, some
+  #         assert_equal :args, args
+  #       end
+  #     end
   #   end
   module TestHelper
     # Asserts that a certain callbacks has been recorded by +recorder+.
@@ -41,10 +53,16 @@ class On
     #   assert_callback recorder, :success, "some", "args"
     #
     def assert_callback(recorder, name, *args)
+      raise ArgumentError, "Provide args or block but not both" if block_given? && !args.empty?
+
       callback = recorder.last_record
       assert callback, "No callbacks found"
       assert_equal name, callback.name, "Callback was #{callback}"
-      assert_equal args, callback.args, "Callback was #{callback}"
+      if block_given?
+        yield *callback.args
+      else
+        assert_equal args, callback.args, "Callback was #{callback}"
+      end
     end
 
     # Asserts that *no* callbacks has been recorder by +recorder+.
@@ -101,11 +119,15 @@ class On
       def record_callback(on, *names)
         names.each do |name|
           on.on name do |*args|
-            @callbacks << Callback.new(name, args)
+            callback_recorded(name, args)
           end
         end
       end
 
+      def callback_recorded(name, args)
+        @callbacks << Callback.new(name, args)
+      end
+
       # Short-hand for &+recorder.record_all+.
       def to_proc
         record_all

data/lib/on/version.rb

@@ -1,3 +1,3 @@
 class On
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/on_test_helper_test.rb

@@ -0,0 +1,105 @@
+require 'helper'
+
+require 'on'
+
+class OnTestHelperTest < Testem
+  context "assert_callback" do
+    test "match w/o args" do
+      record :foo
+      assert_callback recorder, :foo
+    end
+
+    test "match with args" do
+      record :foo, :bar, :baz
+      assert_callback recorder, :foo, :bar, :baz
+    end
+
+    test "match with block" do
+      called = false
+      record :foo, :bar, :baz
+      assert_callback recorder, :foo do |bar, baz|
+        called = true
+        assert_equal :bar, bar
+        assert_equal :baz, baz
+      end
+      assert called
+    end
+
+    test "no callbacks found" do
+      e = assert_raises MiniTest::Assertion do
+        assert_callback recorder, :foo
+      end
+      assert_equal "No callbacks found", e.message
+    end
+
+    test "no callbacks found anymore" do
+      record :foo
+      assert_callback recorder, :foo
+      e = assert_raises MiniTest::Assertion do
+        assert_callback recorder, :foo
+      end
+      assert_equal "No callbacks found", e.message
+    end
+
+    test "mismatch name" do
+      record :foo
+
+      e = assert_raises MiniTest::Assertion do
+        assert_callback recorder, :bar
+      end
+      assert_match /Expected: :bar\n\s*Actual: :foo/, e.message
+    end
+
+    test "mismatch args" do
+      record :foo, :bar
+      e = assert_raises MiniTest::Assertion do
+        assert_callback recorder, :foo, :baz
+      end
+      assert_match /Expected: \[:baz\]\n\s*Actual: \[:bar\]/, e.message
+    end
+
+    test "mismatch block" do
+      called = false
+      record :foo, :bar
+      e = assert_raises MiniTest::Assertion do
+        assert_callback recorder, :foo do |bar|
+          called = true
+          assert_equal :baz, bar
+        end
+      end
+      assert_match /Expected: :baz\n\s*Actual: :bar/, e.message
+      assert called
+    end
+
+    test "fail on args and block" do
+      called = false
+      e = assert_raises ArgumentError do
+        assert_callback recorder, :foo, :bar do
+          called = true
+        end
+      end
+      assert_equal "Provide args or block but not both", e.message
+      refute called
+    end
+  end
+
+  context "refute_callbacks" do
+    test "nothing recorded" do
+      refute_callbacks recorder
+    end
+
+    test "fail when something recorded" do
+      record :foo
+      e = assert_raises MiniTest::Assertion do
+        refute_callbacks recorder
+      end
+      assert_match /Something has been recorded/, e.message
+    end
+  end
+
+  private
+
+  def record(name, *args)
+    recorder.callback_recorded(name, args)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 'on'
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -97,6 +97,7 @@ files:
 - test/integration_test.rb
 - test/on_proc_test.rb
 - test/on_test.rb
+- test/on_test_helper_test.rb
 homepage: https://github.com/neopoly/on
 licenses: []
 post_install_message: 
@@ -111,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2276299258964583998
+      hash: 1483705294558873466
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2276299258964583998
+      hash: 1483705294558873466
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -132,3 +133,4 @@ test_files:
 - test/integration_test.rb
 - test/on_proc_test.rb
 - test/on_test.rb
+- test/on_test_helper_test.rb