mocha 0.14.0 → 1.0.0.alpha

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>

metadata

@@ -1,115 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mocha
-version: !ruby/object:Gem::Version 
-  hash: 39
-  prerelease: 
-  segments: 
-  - 0
-  - 14
-  - 0
-  version: 0.14.0
+version: !ruby/object:Gem::Version
+  version: 1.0.0.alpha
 platform: ruby
-authors: 
+authors:
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-14 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 0
-        - 1
-        version: 0.0.1
-  version_requirements: *id001
+date: 2013-12-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: metaclass
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
-  name: rake
   prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 0
-        - 1
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.0.1
-  version_requirements: *id003
-  name: introspection
-  prerelease: false
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
-  name: yard
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: introspection
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        version: "1"
-  version_requirements: *id005
-  name: redcarpet
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
-description: Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+description: Mocking and stubbing library with JMock/SchMock syntax, which allows
+  mocking and stubbing of methods on real (non-mock) classes.
 email: mocha-developer@googlegroups.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gemtest
-- .yardopts
+files:
+- ".gemtest"
+- ".yardopts"
 - COPYING.md
 - Gemfile
 - MIT-LICENSE.md
 - README.md
 - RELEASE.md
 - Rakefile
-- build-matrix.rb
+- bin/build-matrix
 - gemfiles/Gemfile.minitest.1.3.0
 - gemfiles/Gemfile.minitest.1.4.0
 - gemfiles/Gemfile.minitest.1.4.1
@@ -138,6 +124,8 @@ files:
 - lib/mocha/configuration.rb
 - lib/mocha/debug.rb
 - lib/mocha/deprecation.rb
+- lib/mocha/detection/mini_test.rb
+- lib/mocha/detection/test_unit.rb
 - lib/mocha/exception_raiser.rb
 - lib/mocha/expectation.rb
 - lib/mocha/expectation_error.rb
@@ -175,6 +163,7 @@ files:
 - lib/mocha/is_a.rb
 - lib/mocha/logger.rb
 - lib/mocha/method_matcher.rb
+- lib/mocha/mini_test.rb
 - lib/mocha/mock.rb
 - lib/mocha/mockery.rb
 - lib/mocha/module_method.rb
@@ -207,6 +196,7 @@ files:
 - lib/mocha/parameter_matchers/yaml_equivalent.rb
 - lib/mocha/parameters_matcher.rb
 - lib/mocha/pretty_parameters.rb
+- lib/mocha/receivers.rb
 - lib/mocha/return_values.rb
 - lib/mocha/sequence.rb
 - lib/mocha/setup.rb
@@ -215,6 +205,7 @@ files:
 - lib/mocha/standalone.rb
 - lib/mocha/state_machine.rb
 - lib/mocha/stubbing_error.rb
+- lib/mocha/test_unit.rb
 - lib/mocha/thrower.rb
 - lib/mocha/unexpected_invocation.rb
 - lib/mocha/version.rb
@@ -244,6 +235,7 @@ files:
 - test/acceptance/return_value_test.rb
 - test/acceptance/sequence_test.rb
 - test/acceptance/states_test.rb
+- test/acceptance/stub_any_instance_method_defined_on_superclass_test.rb
 - test/acceptance/stub_any_instance_method_test.rb
 - test/acceptance/stub_class_method_defined_on_active_record_association_proxy_test.rb
 - test/acceptance/stub_class_method_defined_on_class_test.rb
@@ -276,7 +268,9 @@ files:
 - test/acceptance/stubbing_on_non_mock_object_test.rb
 - test/acceptance/stubbing_same_class_method_on_parent_and_child_classes_test.rb
 - test/acceptance/throw_test.rb
+- test/acceptance/unexpected_invocation_test.rb
 - test/acceptance/unstubbing_test.rb
+- test/assertions.rb
 - test/deprecation_disabler.rb
 - test/execution_point.rb
 - test/integration/mini_test_test.rb
@@ -331,6 +325,7 @@ files:
 - test/unit/parameter_matchers/stub_matcher.rb
 - test/unit/parameter_matchers/yaml_equivalent_test.rb
 - test/unit/parameters_matcher_test.rb
+- test/unit/receivers_test.rb
 - test/unit/return_values_test.rb
 - test/unit/sequence_test.rb
 - test/unit/single_return_value_test.rb
@@ -341,39 +336,28 @@ files:
 - test/unit/yield_parameters_test.rb
 - yard-templates/default/layout/html/google_analytics.erb
 - yard-templates/default/layout/html/setup.rb
-has_rdoc: yard
 homepage: http://gofreerange.com/mocha/docs
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: mocha
-rubygems_version: 1.6.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 3
 summary: Mocking and stubbing library
 test_files: []
-
+has_rdoc: yard

data/build-matrix.rb

@@ -1,71 +0,0 @@
-#!/usr/bin/env ruby
-
-def execute(*commands)
-  commands.each do |command|
-    system(command)
-    unless $?.success?
-      message = [
-        "Executing shell command failed.",
-        "  Command: #{command}",
-        "  Status:  #{$?.exitstatus}"
-      ].join("\n")
-      raise message
-    end
-  end
-end
-
-def reset_bundle
-  execute(
-    "rm -rf .bundle/gems",
-    "rm -rf gemfiles/.bundle/gems",
-    "rm -f *.lock",
-    "rm -f gemfiles/*.lock"
-  )
-end
-
-def with_rbenv(command)
-  %{export PATH="$HOME/.rbenv/bin:$PATH"; eval "$(rbenv init -)"; #{command}}
-end
-
-def run(gemfile, task = "test")
-  ENV["BUNDLE_GEMFILE"] = gemfile
-  ENV["MOCHA_OPTIONS"] = "debug"
-  ENV["MOCHA_NO_DOCS"] = "true"
-  reset_bundle
-  execute(
-    with_rbenv("bundle install --gemfile=#{gemfile}"),
-    with_rbenv("bundle exec rake #{task}")
-  )
-end
-
-EXCLUDED_RUBY_193_GEMFILES = [
-  "gemfiles/Gemfile.minitest.1.3.0",
-  "gemfiles/Gemfile.minitest.1.4.0",
-  "gemfiles/Gemfile.minitest.1.4.1",
-  "gemfiles/Gemfile.minitest.1.4.2"
-]
-
-RUBY_VERSIONS = ["1.8.7-p352", "1.9.3-p125-perf"]
-
-RUBY_VERSIONS.each do |ruby_version|
-  execute("rbenv local #{ruby_version}")
-  reset_bundle
-  run("Gemfile")
-  execute("rbenv local --unset")
-end
-
-RUBY_VERSIONS.each do |ruby_version|
-  execute("rbenv local #{ruby_version}")
-  ["test-unit", "minitest"].each do |test_library|
-    reset_bundle
-    (Dir["gemfiles/Gemfile.#{test_library}.*"] + ["Gemfile"]).each do |gemfile|
-      ruby_version_without_patch = ruby_version.split("-")[0]
-      next if (ruby_version_without_patch == "1.9.3") && EXCLUDED_RUBY_193_GEMFILES.include?(gemfile)
-      next if (ruby_version_without_patch == "1.8.7") && (gemfile == "Gemfile") && (test_library == "minitest")
-      p [ruby_version_without_patch, test_library, gemfile]
-      ENV['MOCHA_RUN_INTEGRATION_TESTS'] = test_library
-      run(gemfile)
-    end
-  end
-  execute("rbenv local --unset")
-end