mocha 0.14.0 → 1.0.0

data/lib/mocha/parameter_matchers/responds_with.rb

@@ -39,7 +39,7 @@ module Mocha
       # @private
       def matches?(available_parameters)
         parameter = available_parameters.shift
-        parameter.__send__(@message) == @result
+        @result.to_matcher.matches?( [parameter.__send__(@message)] )
       end
 
       # @private

data/lib/mocha/receivers.rb

@@ -0,0 +1,49 @@
+module Mocha
+
+  class ObjectReceiver
+
+    def initialize(object)
+      @object = object
+    end
+
+    def mocks
+      object, mocks = @object, []
+      while object do
+        mocks << object.mocha
+        object = object.is_a?(Class) ? object.superclass : nil
+      end
+      mocks
+    end
+
+  end
+
+  class AnyInstanceReceiver
+
+    def initialize(klass)
+      @klass = klass
+    end
+
+    def mocks
+      klass, mocks = @klass, []
+      while klass do
+        mocks << klass.any_instance.mocha
+        klass = klass.superclass
+      end
+      mocks
+    end
+
+  end
+
+  class DefaultReceiver
+
+    def initialize(mock)
+      @mock = mock
+    end
+
+    def mocks
+      [@mock]
+    end
+
+  end
+
+end

data/lib/mocha/setup.rb

@@ -1,4 +1,3 @@
-require 'mocha/version'
 require 'mocha/integration'
 
 module Mocha

data/lib/mocha/test_unit.rb

@@ -0,0 +1,3 @@
+require "mocha/integration/test_unit"
+
+Mocha::Integration::TestUnit.activate

data/lib/mocha/unexpected_invocation.rb

@@ -5,17 +5,22 @@ module Mocha
 
     # @private
     def initialize(mock, symbol, *arguments)
-      @mock = mock
-      @method_matcher = MethodMatcher.new(symbol)
-      @parameters_matcher = ParametersMatcher.new(arguments)
+      @mock, @symbol, @arguments = mock, symbol, arguments
     end
 
     # @private
-    def to_s
-      method_signature = "#{@mock.mocha_inspect}.#{@method_matcher.mocha_inspect}#{@parameters_matcher.mocha_inspect}"
+    def full_description
+      method_matcher = MethodMatcher.new(@symbol)
+      parameters_matcher = ParametersMatcher.new(@arguments)
+      method_signature = "#{@mock.mocha_inspect}.#{method_matcher.mocha_inspect}#{parameters_matcher.mocha_inspect}"
       "unexpected invocation: #{method_signature}\n"
     end
 
+    # @private
+    def short_description
+      "unexpected invocation: #{@symbol}(#{@arguments.join(', ')})"
+    end
+
   end
 
 end

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "0.14.0"
+  VERSION = "1.0.0"
 end

data/lib/mocha.rb

@@ -1,8 +1 @@
 require 'mocha/version'
-require 'mocha/integration'
-require 'mocha/deprecation'
-
-Mocha::Deprecation.warning("Change `require 'mocha'` to `require 'mocha/setup'`.")
-
-require 'mocha/setup'
-

data/test/acceptance/stub_any_instance_method_defined_on_superclass_test.rb

@@ -0,0 +1,34 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+require 'mocha/setup'
+
+class StubAnyInstanceMethodDefinedOnSuperclassTest < Mocha::TestCase
+
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
+  def test_should_stub_method_and_leave_it_unchanged_after_test
+    superklass = Class.new do
+      def my_superclass_method
+        :original_return_value
+      end
+      public :my_superclass_method
+    end
+    klass = Class.new(superklass)
+    instance = klass.new
+    assert_snapshot_unchanged(instance) do
+      test_result = run_as_test do
+        superklass.any_instance.stubs(:my_superclass_method).returns(:new_return_value)
+        assert_equal :new_return_value, instance.my_superclass_method
+      end
+      assert_passed(test_result)
+    end
+    assert_equal :original_return_value, instance.my_superclass_method
+  end
+end

data/test/acceptance/stub_any_instance_method_test.rb

@@ -22,6 +22,7 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
     instance = klass.new
     test_result = run_as_test do
       klass.any_instance.stubs(:my_instance_method).returns(:new_return_value)
+      assert_method_visiblity instance, :my_instance_method, :public
       assert_equal :new_return_value, instance.my_instance_method
     end
     assert_passed(test_result)

data/test/acceptance/stub_class_method_defined_on_class_test.rb

@@ -26,6 +26,7 @@ class StubClassMethodDefinedOnClassTest < Mocha::TestCase
     assert_snapshot_unchanged(klass) do
       test_result = run_as_test do
         klass.stubs(:my_class_method).returns(:new_return_value)
+        assert_method_visiblity klass, :my_class_method, :public
         assert_equal :new_return_value, klass.my_class_method
       end
       assert_passed(test_result)
@@ -46,6 +47,7 @@ class StubClassMethodDefinedOnClassTest < Mocha::TestCase
     assert_snapshot_unchanged(klass) do
       test_result = run_as_test do
         klass.stubs(:my_class_method).returns(:new_return_value)
+        assert_method_visiblity klass, :my_class_method, :protected
         assert_equal :new_return_value, klass.send(:my_class_method)
       end
       assert_passed(test_result)
@@ -66,6 +68,7 @@ class StubClassMethodDefinedOnClassTest < Mocha::TestCase
     assert_snapshot_unchanged(klass) do
       test_result = run_as_test do
         klass.stubs(:my_class_method).returns(:new_return_value)
+        assert_method_visiblity klass, :my_class_method, :private
         assert_equal :new_return_value, klass.send(:my_class_method)
       end
       assert_passed(test_result)

data/test/acceptance/stub_class_method_defined_on_superclass_test.rb

@@ -13,7 +13,7 @@ class StubClassMethodDefinedOnSuperclassTest < Mocha::TestCase
     teardown_acceptance_test
   end
 
-  def test_should_stub_public_method_and_leave_it_unchanged_after_test
+  def test_should_stub_public_method_on_child_class_and_leave_it_unchanged_after_test
     superklass = Class.new do
       class << self
         def my_class_method
@@ -33,7 +33,7 @@ class StubClassMethodDefinedOnSuperclassTest < Mocha::TestCase
     assert_equal :original_return_value, klass.my_class_method
   end
 
-  def test_should_stub_protected_method_and_leave_it_unchanged_after_test
+  def test_should_stub_protected_method_on_child_class_and_leave_it_unchanged_after_test
     superklass = Class.new do
       class << self
         def my_class_method
@@ -53,7 +53,7 @@ class StubClassMethodDefinedOnSuperclassTest < Mocha::TestCase
     assert_equal :original_return_value, klass.send(:my_class_method)
   end
 
-  def test_should_stub_private_method_and_leave_it_unchanged_after_test
+  def test_should_stub_private_method_on_child_class_and_leave_it_unchanged_after_test
     superklass = Class.new do
       class << self
         def my_class_method
@@ -72,4 +72,41 @@ class StubClassMethodDefinedOnSuperclassTest < Mocha::TestCase
     end
     assert_equal :original_return_value, klass.send(:my_class_method)
   end
+
+  def test_should_stub_method_on_superclass_and_leave_it_unchanged_after_test
+    superklass = Class.new do
+      class << self
+        def my_class_method
+          :original_return_value
+        end
+        public :my_class_method
+      end
+    end
+    klass = Class.new(superklass)
+    assert_snapshot_unchanged(klass) do
+      test_result = run_as_test do
+        superklass.stubs(:my_class_method).returns(:new_return_value)
+        assert_equal :new_return_value, klass.my_class_method
+      end
+      assert_passed(test_result)
+    end
+    assert_equal :original_return_value, klass.my_class_method
+  end
+
+  def test_stub_on_earliest_receiver_should_take_priority
+    superklass = Class.new do
+      class << self
+        def my_class_method
+          :original_return_value
+        end
+      end
+    end
+    klass = Class.new(superklass)
+    test_result = run_as_test do
+      klass.stubs(:my_class_method).returns(:klass_return_value)
+      superklass.stubs(:my_class_method).returns(:superklass_return_value)
+      assert_equal :klass_return_value, klass.my_class_method
+    end
+    assert_passed(test_result)
+  end
 end

data/test/acceptance/stub_instance_method_defined_on_class_test.rb

@@ -23,6 +23,7 @@ class StubInstanceMethodDefinedOnClassTest < Mocha::TestCase
     assert_snapshot_unchanged(instance) do
       test_result = run_as_test do
         instance.stubs(:my_instance_method).returns(:new_return_value)
+        assert_method_visiblity instance, :my_instance_method, :public
         assert_equal :new_return_value, instance.my_instance_method
       end
       assert_passed(test_result)
@@ -40,6 +41,7 @@ class StubInstanceMethodDefinedOnClassTest < Mocha::TestCase
     assert_snapshot_unchanged(instance) do
       test_result = run_as_test do
         instance.stubs(:my_instance_method).returns(:new_return_value)
+        assert_method_visiblity instance, :my_instance_method, :protected
         assert_equal :new_return_value, instance.send(:my_instance_method)
       end
       assert_passed(test_result)
@@ -57,6 +59,7 @@ class StubInstanceMethodDefinedOnClassTest < Mocha::TestCase
     assert_snapshot_unchanged(instance) do
       test_result = run_as_test do
         instance.stubs(:my_instance_method).returns(:new_return_value)
+        assert_method_visiblity instance, :my_instance_method, :private
         assert_equal :new_return_value, instance.send(:my_instance_method)
       end
       assert_passed(test_result)

data/test/acceptance/unexpected_invocation_test.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+require 'mocha/setup'
+
+class UnexpectedInvocationTest < Mocha::TestCase
+
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
+  def test_avoid_recursion_when_unexpected_invocation_exception_message_depends_on_uninspectable_object
+    test_result = run_as_test do
+      instance = Class.new.new
+      instance.expects(:inspect).never
+      instance.inspect(1, 2, 'foo')
+    end
+    assert_failed(test_result)
+    assert_equal "unexpected invocation: inspect(1, 2, foo)", test_result.failure_message_lines[0]
+  end
+end

data/test/assertions.rb

@@ -0,0 +1,6 @@
+module Assertions
+  def assert_method_visiblity(object, method_name, visiblity)
+    method_key = RUBY_VERSION < '1.9' ? method_name.to_s : method_name.to_sym
+    assert object.send("#{visiblity}_methods", false).include?(method_key)
+  end
+end

data/test/integration/mini_test_test.rb

@@ -1,22 +1,8 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-begin
-  require "minitest"
-rescue LoadError
-end
-begin
-  require "minitest/unit"
-rescue LoadError
-end
-
-require "mocha/setup"
+require "mocha/mini_test"
 require "integration/shared_tests"
 
-if defined?(::Minitest) || defined?(MiniTest)
-  testcase = defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase
-  class MiniTestTest < testcase
-    include SharedTests
-  end
-else
-  puts "MiniTest not available - no point in running tests."
-end
+class MiniTestTest < Mocha::TestCase
+  include SharedTests
+end

data/test/integration/test_unit_test.rb

@@ -1,9 +1,8 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-require "test/unit"
-require "mocha/setup"
+require "mocha/test_unit"
 require "integration/shared_tests"
 
-class TestUnitTest < Test::Unit::TestCase
+class TestUnitTest < Mocha::TestCase
   include SharedTests
 end

data/test/test_helper.rb

@@ -8,6 +8,8 @@ $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit'))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit', 'parameter_matchers'))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'acceptance'))
 
+require 'mocha/detection/mini_test'
+
 begin
   require 'minitest'
 rescue LoadError
@@ -17,13 +19,15 @@ begin
 rescue LoadError
 end
 
-if defined?(::Minitest) || defined?(MiniTest)
+module Mocha; end
+
+if (minitest_testcase = Mocha::Detection::MiniTest.testcase) && (ENV['MOCHA_RUN_INTEGRATION_TESTS'] != 'test-unit')
   begin
     require 'minitest/autorun'
   rescue LoadError
     MiniTest::Unit.autorun
   end
-  class Mocha::TestCase < defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase
+  class Mocha::TestCase < minitest_testcase
     def assert_nothing_raised(exception = StandardError)
       yield
     rescue exception => e

data/test/test_runner.rb

@@ -1,10 +1,6 @@
-if defined?(::Minitest::VERSION) && (Gem::Version.new(::Minitest::VERSION) >= Gem::Version.new('5.0.0'))
-  require File.expand_path('../minitest_result', __FILE__)
-elsif defined?(::MiniTest::Unit::VERSION) && (Gem::Version.new(::MiniTest::Unit::VERSION) < Gem::Version.new('5.0.0'))
-  require File.expand_path('../mini_test_result', __FILE__)
-else
-  require File.expand_path('../test_unit_result', __FILE__)
-end
+require 'assertions'
+
+require 'mocha/detection/mini_test'
 
 module TestRunner
   def run_as_test(&block)
@@ -14,6 +10,8 @@ module TestRunner
   def run_as_tests(methods = {})
     base_class = Mocha::TestCase
     test_class = Class.new(base_class) do
+      include Assertions
+
       methods.each do |(method_name, proc)|
         define_method(method_name, proc)
       end
@@ -21,19 +19,25 @@ module TestRunner
 
     tests = methods.keys.select { |m| m.to_s[/^test/] }.map { |m| test_class.new(m) }
 
-    if defined?(::Minitest::VERSION) && (Gem::Version.new(::Minitest::VERSION) >= Gem::Version.new('5.0.0'))
-      tests.each do |test|
-        test.run
-      end
-      Minitest::Runnable.runnables.delete(test_class)
-      test_result = MinitestResult.new(tests)
-    elsif defined?(::MiniTest::Unit::VERSION) && (Gem::Version.new(::MiniTest::Unit::VERSION) < Gem::Version.new('5.0.0'))
-      runner = MiniTest::Unit.new
-      tests.each do |test|
-        test.run(runner)
+    if Mocha::Detection::MiniTest.testcase && (ENV['MOCHA_RUN_INTEGRATION_TESTS'] != 'test-unit')
+      minitest_version = Gem::Version.new(Mocha::Detection::MiniTest.version)
+      if Gem::Requirement.new('>= 5.0.0').satisfied_by?(minitest_version)
+        require File.expand_path('../minitest_result', __FILE__)
+        tests.each do |test|
+          test.run
+        end
+        Minitest::Runnable.runnables.delete(test_class)
+        test_result = MinitestResult.new(tests)
+      elsif Gem::Requirement.new('> 0.0.0', '< 5.0.0').satisfied_by?(minitest_version)
+        require File.expand_path('../mini_test_result', __FILE__)
+        runner = MiniTest::Unit.new
+        tests.each do |test|
+          test.run(runner)
+        end
+        test_result = MiniTestResult.new(runner, tests)
       end
-      test_result = MiniTestResult.new(runner, tests)
     else
+      require File.expand_path('../test_unit_result', __FILE__)
       test_result = TestUnitResult.build_test_result
       tests.each do |test|
         test.run(test_result) {}

data/test/unit/expectation_list_test.rb

@@ -68,4 +68,15 @@ class ExpectationListTest < Mocha::TestCase
     assert_same expectation1, expectation_list.match_allowing_invocation(:my_method)
   end
 
+  def test_should_combine_two_expectation_lists_into_one
+    expectation_list1 = ExpectationList.new
+    expectation_list2 = ExpectationList.new
+    expectation1 = Expectation.new(nil, :my_method)
+    expectation2 = Expectation.new(nil, :my_method)
+    expectation_list1.add(expectation1)
+    expectation_list2.add(expectation2)
+    expectation_list = expectation_list1 + expectation_list2
+    assert_equal [expectation1, expectation2], expectation_list.to_a
+  end
+
 end

data/test/unit/parameter_matchers/responds_with_test.rb

@@ -1,6 +1,7 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
 require 'mocha/parameter_matchers/responds_with'
+require 'mocha/parameter_matchers/object'
 require 'mocha/inspect'
 
 class RespondsWithTest < Mocha::TestCase
@@ -17,6 +18,12 @@ class RespondsWithTest < Mocha::TestCase
     assert !matcher.matches?(['bar'])
   end
 
+  def test_should_match_parameter_responding_with_nested_responds_with_matcher
+    matcher = responds_with(:foo, responds_with(:bar, 'baz'))
+    object = Class.new { def foo; Class.new { def bar; 'baz'; end }.new; end }.new
+    assert matcher.matches?([object])
+  end
+
   def test_should_describe_matcher
     matcher = responds_with(:foo, :bar)
     assert_equal 'responds_with(:foo, :bar)', matcher.mocha_inspect

data/test/unit/receivers_test.rb

@@ -0,0 +1,66 @@
+require File.expand_path('../../test_helper', __FILE__)
+require 'mocha/receivers'
+
+class ObjectReceiverTest < Mocha::TestCase
+  include Mocha
+
+  class FakeObject < Struct.new(:mocha)
+    def is_a?(klass)
+      false
+    end
+  end
+
+  class FakeClass < Struct.new(:superclass, :mocha)
+    def is_a?(klass)
+      klass == Class
+    end
+  end
+
+  def test_mocks_returns_mock_for_object
+    object = FakeObject.new(:mocha)
+    receiver = ObjectReceiver.new(object)
+    assert_equal [:mocha], receiver.mocks
+  end
+
+  def test_mocks_returns_mocks_for_class_and_its_superclasses
+    grandparent = FakeClass.new(nil, :grandparent_mocha)
+    parent = FakeClass.new(grandparent, :parent_mocha)
+    klass = FakeClass.new(parent, :mocha)
+    receiver = ObjectReceiver.new(klass)
+    assert_equal [:mocha, :parent_mocha, :grandparent_mocha], receiver.mocks
+  end
+end
+
+class AnyInstanceReceiverTest < Mocha::TestCase
+  include Mocha
+
+  class FakeAnyInstanceClass
+    attr_reader :superclass
+
+    def initialize(superclass, mocha)
+      @superclass, @mocha = superclass, mocha
+    end
+
+    def any_instance
+      Struct.new(:mocha).new(@mocha)
+    end
+  end
+
+  def test_mocks_returns_mocks_for_class_and_its_superclasses
+    grandparent = FakeAnyInstanceClass.new(nil, :grandparent_mocha)
+    parent = FakeAnyInstanceClass.new(grandparent, :parent_mocha)
+    klass = FakeAnyInstanceClass.new(parent, :mocha)
+    receiver = AnyInstanceReceiver.new(klass)
+    assert_equal [:mocha, :parent_mocha, :grandparent_mocha], receiver.mocks
+  end
+end
+
+class DefaultReceiverTest < Mocha::TestCase
+  include Mocha
+
+  def test_mocks_returns_mock
+    mock = :mocha
+    receiver = DefaultReceiver.new(mock)
+    assert_equal [:mocha], receiver.mocks
+  end
+end

data/yard-templates/default/layout/html/google_analytics.erb

@@ -1,11 +1,11 @@
 <script src="/javascripts/app.js" type="text/javascript" charset="utf-8"></script>
 
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("<%= ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID'] %>");
-pageTracker._trackPageview();
-} catch(err) {}</script>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', '<%= ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID'] %>', 'gofreerange.com');
+  ga('send', 'pageview');
+</script>