opal-rspec 0.4.3 → 0.5.0.beta1

data/{vendor_lib → rspec-mocks/lib}/rspec/mocks/matchers/receive.rb

@@ -1,17 +1,14 @@
+RSpec::Support.require_rspec_mocks 'matchers/expectation_customization'
+
 module RSpec
   module Mocks
     module Matchers
+      # @private
       class Receive
         def initialize(message, block)
           @message                 = message
           @block                   = block
           @recorded_customizations = []
-
-          # MRI, JRuby and RBX report the caller inconsistently; MRI
-          # reports an extra "in `new'" line in the backtrace that the
-          # others do not include. The safest way to find the right
-          # line is to search for the first line BEFORE rspec/mocks/syntax.rb.
-          @backtrace_line = CallerFilter.first_non_rspec_line
         end
 
         def name
@@ -27,7 +24,7 @@ module RSpec
         def setup_negative_expectation(subject, &block)
           # ensure `never` goes first for cases like `never.and_return(5)`,
           # where `and_return` is meant to raise an error
-          @recorded_customizations.unshift Customization.new(:never, [], nil)
+          @recorded_customizations.unshift ExpectationCustomization.new(:never, [], nil)
 
           warn_if_any_instance("expect", subject)
 
@@ -56,7 +53,7 @@ module RSpec
           next if method_defined?(method)
 
           define_method(method) do |*args, &block|
-            @recorded_customizations << Customization.new(method, args, block)
+            @recorded_customizations << ExpectationCustomization.new(method, args, block)
             self
           end
         end
@@ -64,28 +61,30 @@ module RSpec
       private
 
         def warn_if_any_instance(expression, subject)
-          if AnyInstance::Recorder === subject
-            RSpec.warning(
-              "`#{expression}(#{subject.klass}.any_instance).to` " <<
-              "is probably not what you meant, it does not operate on " <<
-              "any instance of `#{subject.klass}`. " <<
-              "Use `#{expression}_any_instance_of(#{subject.klass}).to` instead."
-            )
-          end
+          return unless AnyInstance::Proxy === subject
+
+          RSpec.warning(
+            "`#{expression}(#{subject.klass}.any_instance).to` " \
+            "is probably not what you meant, it does not operate on " \
+            "any instance of `#{subject.klass}`. " \
+            "Use `#{expression}_any_instance_of(#{subject.klass}).to` instead."
+          )
         end
 
         def setup_mock_proxy_method_substitute(subject, method, block)
-          proxy = ::RSpec::Mocks.proxy_for(subject)
-          setup_method_substitute(proxy, method, block, @backtrace_line)
+          proxy = ::RSpec::Mocks.space.proxy_for(subject)
+          setup_method_substitute(proxy, method, block)
         end
 
         def setup_any_instance_method_substitute(subject, method, block)
-          any_instance_recorder = ::RSpec::Mocks.any_instance_recorder_for(subject)
-          setup_method_substitute(any_instance_recorder, method, block)
+          proxy = ::RSpec::Mocks.space.any_instance_proxy_for(subject)
+          setup_method_substitute(proxy, method, block)
         end
 
         def setup_method_substitute(host, method, block, *args)
           args << @message.to_sym
+          block = move_block_to_last_customization(block)
+
           expectation = host.__send__(method, *args, &(@block || block))
 
           @recorded_customizations.each do |customization|
@@ -94,19 +93,14 @@ module RSpec
           expectation
         end
 
-        class Customization
-          def initialize(method_name, args, block)
-            @method_name = method_name
-            @args        = args
-            @block       = block
-          end
+        def move_block_to_last_customization(block)
+          last = @recorded_customizations.last
+          return block unless last
 
-          def playback_onto(expectation)
-            expectation.__send__(@method_name, *@args, &@block)
-          end
+          last.block ||= block
+          nil
         end
       end
     end
   end
 end
-

data/rspec-mocks/lib/rspec/mocks/matchers/receive_message_chain.rb

@@ -0,0 +1,66 @@
+RSpec::Support.require_rspec_mocks 'matchers/expectation_customization'
+
+module RSpec
+  module Mocks
+    module Matchers
+      # @private
+      class ReceiveMessageChain
+        def initialize(chain, &block)
+          @chain = chain
+          @block = block
+          @recorded_customizations  = []
+        end
+
+        [:with, :and_return, :and_throw, :and_raise, :and_yield, :and_call_original].each do |msg|
+          define_method(msg) do |*args, &block|
+            @recorded_customizations << ExpectationCustomization.new(msg, args, block)
+            self
+          end
+        end
+
+        def name
+          "receive_message_chain"
+        end
+
+        def setup_allowance(subject, &block)
+          chain = StubChain.stub_chain_on(subject, *@chain, &(@block || block))
+          replay_customizations(chain)
+        end
+
+        def setup_any_instance_allowance(subject, &block)
+          proxy = ::RSpec::Mocks.space.any_instance_proxy_for(subject)
+          chain = proxy.stub_chain(*@chain, &(@block || block))
+          replay_customizations(chain)
+        end
+
+        def setup_any_instance_expectation(subject, &block)
+          proxy = ::RSpec::Mocks.space.any_instance_proxy_for(subject)
+          chain = proxy.expect_chain(*@chain, &(@block || block))
+          replay_customizations(chain)
+        end
+
+        def setup_expectation(subject, &block)
+          chain = ExpectChain.expect_chain_on(subject, *@chain, &(@block || block))
+          replay_customizations(chain)
+        end
+
+        def setup_negative_expectation(*_args)
+          raise NegationUnsupportedError,
+                "`expect(...).not_to receive_message_chain` is not supported " \
+                "since it doesn't really make sense. What would it even mean?"
+        end
+
+        alias matches? setup_expectation
+        alias does_not_match? setup_negative_expectation
+
+      private
+
+        def replay_customizations(chain)
+          @recorded_customizations.each do |customization|
+            customization.playback_onto(chain)
+          end
+        end
+      end
+    end
+  end
+end

data/{vendor_lib → rspec-mocks/lib}/rspec/mocks/matchers/receive_messages.rb

@@ -1,8 +1,8 @@
 module RSpec
   module Mocks
     module Matchers
+      # @private
       class ReceiveMessages
-
         def initialize(message_return_value_hash)
           @message_return_value_hash = message_return_value_hash
           @backtrace_line = CallerFilter.first_non_rspec_line
@@ -14,29 +14,29 @@ module RSpec
 
         def setup_expectation(subject)
           warn_about_block if block_given?
-          each_message_on( proxy_on(subject) ) do |host, message, return_value|
+          each_message_on(proxy_on(subject)) do |host, message, return_value|
             host.add_simple_expectation(message, return_value, @backtrace_line)
           end
         end
         alias matches? setup_expectation
 
-        def setup_negative_expectation(subject)
+        def setup_negative_expectation(_subject)
           raise NegationUnsupportedError,
-            "`expect(...).to_not receive_messages` is not supported since it " +
-            "doesn't really make sense. What would it even mean?"
+                "`expect(...).to_not receive_messages` is not supported since it " \
+                "doesn't really make sense. What would it even mean?"
         end
         alias does_not_match? setup_negative_expectation
 
         def setup_allowance(subject)
           warn_about_block if block_given?
-          each_message_on( proxy_on(subject) ) do |host, message, return_value|
+          each_message_on(proxy_on(subject)) do |host, message, return_value|
             host.add_simple_stub(message, return_value)
           end
         end
 
         def setup_any_instance_expectation(subject)
           warn_about_block if block_given?
-          each_message_on( any_instance_of(subject) ) do |host, message, return_value|
+          each_message_on(any_instance_of(subject)) do |host, message, return_value|
             host.should_receive(message).and_return(return_value)
           end
         end
@@ -53,11 +53,11 @@ module RSpec
       private
 
         def proxy_on(subject)
-          ::RSpec::Mocks.proxy_for(subject)
+          ::RSpec::Mocks.space.proxy_for(subject)
         end
 
         def any_instance_of(subject)
-          ::RSpec::Mocks.any_instance_recorder_for(subject)
+          ::RSpec::Mocks.space.any_instance_proxy_for(subject)
         end
 
         def each_message_on(host)
@@ -65,7 +65,6 @@ module RSpec
             yield host, message, value
           end
         end
-
       end
     end
   end

data/rspec-mocks/lib/rspec/mocks/message_chain.rb

@@ -0,0 +1,91 @@
+module RSpec
+  module Mocks
+    # @private
+    class MessageChain
+      attr_reader :object, :chain, :block
+
+      def initialize(object, *chain, &blk)
+        @object = object
+        @chain, @block = format_chain(*chain, &blk)
+      end
+
+      # @api private
+      def setup_chain
+        if chain.length > 1
+          if (matching_stub = find_matching_stub)
+            chain.shift
+            chain_on(matching_stub.invoke(nil), *chain, &@block)
+          elsif (matching_expectation = find_matching_expectation)
+            chain.shift
+            chain_on(matching_expectation.invoke_without_incrementing_received_count(nil), *chain, &@block)
+          else
+            next_in_chain = Double.new
+            expectation(object, chain.shift) { next_in_chain }
+            chain_on(next_in_chain, *chain, &@block)
+          end
+        else
+          expectation(object, chain.shift, &@block)
+        end
+      end
+
+    private
+
+      def expectation(_object, _message, &_return_block)
+        raise NotImplementedError
+      end
+
+      def chain_on(object, *chain, &block)
+        initialize(object, *chain, &block)
+        setup_chain
+      end
+
+      def format_chain(*chain, &blk)
+        if Hash === chain.last
+          hash = chain.pop
+          hash.each do |k, v|
+            chain << k
+            blk = Proc.new { v }
+          end
+        end
+        return chain.join('.').split('.'), blk
+      end
+
+      def find_matching_stub
+        ::RSpec::Mocks.space.proxy_for(object).
+          __send__(:find_matching_method_stub, chain.first.to_sym)
+      end
+
+      def find_matching_expectation
+        ::RSpec::Mocks.space.proxy_for(object).
+          __send__(:find_matching_expectation, chain.first.to_sym)
+      end
+    end
+
+    # @private
+    class ExpectChain < MessageChain
+      # @api private
+      def self.expect_chain_on(object, *chain, &blk)
+        new(object, *chain, &blk).setup_chain
+      end
+
+    private
+
+      def expectation(object, message, &return_block)
+        ::RSpec::Mocks.expect_message(object, message, {}, &return_block)
+      end
+    end
+
+    # @private
+    class StubChain < MessageChain
+      def self.stub_chain_on(object, *chain, &blk)
+        new(object, *chain, &blk).setup_chain
+      end
+
+    private
+
+      def expectation(object, message, &return_block)
+        ::RSpec::Mocks.allow_message(object, message, {}, &return_block)
+      end
+    end
+  end
+end