rspec-mocks 2.10.1 → 2.11.0

data/spec/rspec/mocks/stub_spec.rb

@@ -208,10 +208,10 @@ module RSpec
         end.should raise_error(/received :foo with unexpected arguments/)
       end
 
-      it "complains if called with other arg" do
+      it "complains if called with other arg", :github_issue => [123,147] do
         lambda do
           @stub.foo("other")
-        end.should raise_error(/received :foo with unexpected arguments/)
+        end.should raise_error(/received :foo with unexpected arguments.*Please stub a default value/m)
       end
 
       it "does not complain if also mocked w/ different args" do

data/spec/spec_helper.rb

@@ -1,32 +1,3 @@
-require 'rspec/core'
-require 'rspec/mocks'
-require 'rspec/expectations'
-
-module Macros
-  def treats_method_missing_as_private(options = {:noop => true, :subject => nil})
-    it "has method_missing as private" do
-      self.class.describes.private_instance_methods.should include_method(:method_missing)
-    end
-
-    it "does not respond_to? method_missing (because it's private)" do
-      formatter = options[:subject] || described_class.new({ }, StringIO.new)
-      formatter.should_not respond_to(:method_missing)
-    end
-
-    if options[:noop]
-      it "should respond_to? all messages" do
-        formatter = described_class.new({ }, StringIO.new)
-        formatter.should respond_to(:just_about_anything)
-      end
-
-      it "should respond_to? anything, when given the private flag" do
-        formatter = described_class.new({ }, StringIO.new)
-        formatter.respond_to?(:method_missing, true).should be_true
-      end
-    end
-  end
-end
-
 RSpec::Matchers.define :include_method do |expected|
   match do |actual|
     actual.map { |m| m.to_s }.include?(expected.to_s)
@@ -37,19 +8,8 @@ RSpec.configure do |config|
   config.mock_with :rspec
   config.color_enabled = true
   config.order = :random
-  config.extend(Macros)
   config.include(RSpec::Mocks::Methods)
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run_including :focus
-  config.filter_run_excluding :ruby => lambda {|version|
-    case version.to_s
-    when "!jruby"
-      RUBY_ENGINE != "jruby"
-    when /^> (.*)/
-      !(RUBY_VERSION.to_s > $1)
-    else
-      !(RUBY_VERSION.to_s =~ /^#{version.to_s}/)
-    end
-  }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-05 00:00:00.000000000 Z
+date: 2012-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -69,9 +69,12 @@ files:
 - lib/rspec/mocks.rb
 - lib/rspec/mocks/any_instance.rb
 - lib/rspec/mocks/any_instance/chain.rb
+- lib/rspec/mocks/any_instance/expectation_chain.rb
 - lib/rspec/mocks/any_instance/message_chains.rb
 - lib/rspec/mocks/any_instance/recorder.rb
-- lib/rspec/mocks/argument_expectation.rb
+- lib/rspec/mocks/any_instance/stub_chain.rb
+- lib/rspec/mocks/any_instance/stub_chain_chain.rb
+- lib/rspec/mocks/argument_list_matcher.rb
 - lib/rspec/mocks/argument_matchers.rb
 - lib/rspec/mocks/error_generator.rb
 - lib/rspec/mocks/errors.rb
@@ -89,6 +92,7 @@ files:
 - lib/rspec/mocks/serialization.rb
 - lib/rspec/mocks/space.rb
 - lib/rspec/mocks/standalone.rb
+- lib/rspec/mocks/stub_const.rb
 - lib/rspec/mocks/test_double.rb
 - lib/rspec/mocks/version.rb
 - lib/spec/mocks.rb
@@ -120,6 +124,9 @@ files:
 - features/outside_rspec/configuration.feature
 - features/outside_rspec/standalone.feature
 - features/step_definitions/additional_cli_steps.rb
+- features/stubbing_constants/README.md
+- features/stubbing_constants/stub_defined_constant.feature
+- features/stubbing_constants/stub_undefined_constant.feature
 - features/support/env.rb
 - spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_instance/message_chains_spec.rb
@@ -158,6 +165,7 @@ files:
 - spec/rspec/mocks/serialization_spec.rb
 - spec/rspec/mocks/stash_spec.rb
 - spec/rspec/mocks/stub_chain_spec.rb
+- spec/rspec/mocks/stub_const_spec.rb
 - spec/rspec/mocks/stub_implementation_spec.rb
 - spec/rspec/mocks/stub_spec.rb
 - spec/rspec/mocks/stubbed_message_expectations_spec.rb
@@ -182,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2302057449526330825
+      hash: 1632544807063438503
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -191,13 +199,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2302057449526330825
+      hash: 1632544807063438503
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.10.1
+summary: rspec-mocks-2.11.0
 test_files:
 - features/README.md
 - features/Scope.md
@@ -222,6 +230,9 @@ test_files:
 - features/outside_rspec/configuration.feature
 - features/outside_rspec/standalone.feature
 - features/step_definitions/additional_cli_steps.rb
+- features/stubbing_constants/README.md
+- features/stubbing_constants/stub_defined_constant.feature
+- features/stubbing_constants/stub_undefined_constant.feature
 - features/support/env.rb
 - spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_instance/message_chains_spec.rb
@@ -260,6 +271,7 @@ test_files:
 - spec/rspec/mocks/serialization_spec.rb
 - spec/rspec/mocks/stash_spec.rb
 - spec/rspec/mocks/stub_chain_spec.rb
+- spec/rspec/mocks/stub_const_spec.rb
 - spec/rspec/mocks/stub_implementation_spec.rb
 - spec/rspec/mocks/stub_spec.rb
 - spec/rspec/mocks/stubbed_message_expectations_spec.rb

data/lib/rspec/mocks/argument_expectation.rb

@@ -1,52 +0,0 @@
-module RSpec
-  module Mocks
-    # @api private
-    class ArgumentExpectation
-      attr_reader :args
-
-      def initialize(*args, &block)
-        @args = args
-        @block = args.empty? ? block : nil
-        @match_any_args = false
-        @matchers = nil
-
-        case args.first
-        when ArgumentMatchers::AnyArgsMatcher
-          @match_any_args = true
-        when ArgumentMatchers::NoArgsMatcher
-          @matchers = []
-        else
-          @matchers = args.collect {|arg| matcher_for(arg)}
-        end
-      end
-
-      def matcher_for(arg)
-        return ArgumentMatchers::MatcherMatcher.new(arg) if is_matcher?(arg)
-        return ArgumentMatchers::RegexpMatcher.new(arg)  if arg.is_a?(Regexp)
-        return ArgumentMatchers::EqualityProxy.new(arg)
-      end
-
-      def is_matcher?(obj)
-        !obj.null_object? & obj.respond_to?(:matches?) & [:failure_message_for_should, :failure_message].any? { |m| obj.respond_to?(m) }
-      end
-
-      def args_match?(*args)
-        match_any_args? || block_passes?(*args) || matchers_match?(*args)
-      end
-
-      private
-
-      def block_passes?(*args)
-        @block.call(*args) if @block
-      end
-
-      def matchers_match?(*args)
-        @matchers == args
-      end
-
-      def match_any_args?
-        @match_any_args
-      end
-    end
-  end
-end