xspec 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c981df6d76e0ee48d3cea0ebbe598d88e173c6ce
-  data.tar.gz: 632dd6c9e7230c07d1edd1d4eac07127ae807b8b
+  metadata.gz: 43babe397ea759864cca9b9cf9f7b3f85574df64
+  data.tar.gz: 9bb1e2521e47fd442469f79c15f5ac0bb785a010
 SHA512:
-  metadata.gz: 1c344141ce89c73cb27b7a7f365368f3dc79329f2d06e404397033a277bbff0fd7d8608d5d4f30e31011dc3cbface6917e7c4bf9e17d8f7d915d5700561455f8
-  data.tar.gz: 2dd80e45854d14ea0ff1247469d27fda60fc73d0e07b8db7c60e2461d483496cb28f7d06d386a968cddfc673efba5a78e02e2471b7fc33a6152df75cfe05b1ee
+  metadata.gz: 4a3278a29ac464e56907888124acf872c5151282718286ee141cd57e933e2b28e15d817c81e20b1a5f29199b2097ba962264190d7df44b604ab974ddfed3e76f
+  data.tar.gz: 652428e1709ecb942d8e858f764489cf5681d40b8b09e4061c9b2814a93f956ddc8df5d48b39fc382b6ec755f455a2c3df8fb4fcf7f93bea7aebdd10b808fb3d

data/README.md

@@ -138,4 +138,4 @@ Talk to me before embarking on anything large. Tests are written in XSpec,
 which might do your head in:
 
     bundle install
-    bundle exec bin/run-specs
+    bin/test

data/lib/xspec/assertion_contexts.rb

@@ -162,16 +162,23 @@ EOS
       # is desired, it can be supplied as a block, for example:
       # `expect(double).some_method(1, 2) { "return value" }`
       def expect(obj)
-        Recorder.new(obj)
+        Recorder.new(obj, :_expect)
+      end
+
+      # An allowed method will never be validated by `assert_exhausted`.
+      # Matching expectations are always given precendence to allows.
+      def allow(obj)
+        Recorder.new(obj, :_allow)
       end
 
       class Recorder
-        def initialize(double)
+        def initialize(double, method)
           @double = double
+          @method = method
         end
 
         def method_missing(*args, &ret)
-          @double._expect(args, &(ret || ->{}))
+          @double.__send__(@method, args, &(ret || ->{}))
         end
       end
 
@@ -183,15 +190,24 @@ EOS
         def initialize(klass)
           @klass    = klass
           @expected = []
+          @allowed  = []
         end
 
         def method_missing(*actual_args)
-          i = @expected.find_index {|expected_args, ret|
+          expected_index = @expected.find_index {|expected_args, ret|
             expected_args == actual_args
           }
 
-          if i
-            @expected.delete_at(i)[1].call
+          matching_message = if expected_index
+            @expected.delete_at(expected_index)
+          else
+            @allowed.detect {|expected_args, ret|
+              expected_args == actual_args
+            }
+          end
+
+          if matching_message
+            matching_message[1].call
           else
             name, rest = *actual_args
             ::Kernel.raise DoubleFailure, "Unexpectedly received: %s(%s)" % [
@@ -201,7 +217,7 @@ EOS
           end
         end
 
-        # The two methods needed on this object to set it up and verify it are
+        # The methods needed on this object to set it up and verify it are
         # prefixed by `_` to try to ensure they don't clash with any method
         # expectations. While not fail-safe, users should only be using
         # expectations for a public API, and `_` is traditionally only used
@@ -212,6 +228,12 @@ EOS
           @expected << [args, ret]
         end
 
+        def _allow(args, &ret)
+          @klass.validate_call! args
+
+          @allowed << [args, ret]
+        end
+
         def _verify
           return if @expected.empty?
 

data/lib/xspec/notifiers.rb

@@ -116,6 +116,8 @@ module XSpec
           ]
         end
         out.puts
+
+        true
       end
 
     private

data/spec/unit/doubles_spec.rb

@@ -88,6 +88,26 @@ describe 'doubles assertion context' do
         assert_include 'foo(1, "abc")', e.message
       end
     end
+
+    it 'does not raise on uncalled allows' do
+      assert subject.instance_eval {
+        double = instance_double('Bogus')
+        allow(double).foo
+        assert_exhausted double
+        true
+      }
+    end
+
+    it 'gives precendence to expect' do
+      assert_equal 1, subject.instance_eval {
+        double = instance_double('Bogus')
+        allow(double).foo
+        expect(double).foo { 1 }
+        ret = double.foo
+        assert_exhausted double
+        ret
+      }
+    end
   end
 
   describe 'instance_double' do

data/spec/unit/notifiers_spec.rb

@@ -154,6 +154,16 @@ describe 'null notifier' do
   it_behaves_like_a ComposableNotifier
 end
 
+describe 'timings at end' do
+  let(:notifier) { XSpec::Notifier::TimingsAtEnd.new }
+
+  it 'always returns true' do
+    assert notifier.run_finish
+  end
+
+  it_behaves_like_a ComposableNotifier
+end
+
 def make_nested_test(parent_names = [], work_name = nil)
   XSpec::NestedUnitOfWork.new(
     parent_names.map {|name| XSpec::Context.make(name, Module.new) },

data/xspec.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |gem|
   gem.bindir        = "bin"
   gem.executables  << "xspec"
   gem.license       = "Apache 2.0"
-  gem.version       = "0.0.1"
+  gem.version       = "0.0.2"
   gem.has_rdoc      = false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xspec
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Xavier Shay