mocha 1.0.0.alpha → 1.10.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b1d70e16a4b44a20689afee9a18311ac4fd1fc74
-  data.tar.gz: f09339da5ed1062102aecb18a9461b89314b2fad
+SHA256:
+  metadata.gz: 17067ef2117df2bcf63d40f8e764f28d584a5e6243e40d42533a571532329c43
+  data.tar.gz: c2ce2f9b3ca8950dc8fa8958a106bac339f3a96018849c50954ac4b53f024893
 SHA512:
-  metadata.gz: ef120f8f4200434740018195cbada145b17ae893cb615cd45de7b75131acfc1712c0e8779b74a3d3591235382d4cc5babd432a2e78638b349730dd18dc628cf1
-  data.tar.gz: cc80f87dde614a0a06141edabbebc81696ffed1541349ecbcc9fd444888729130f66f9b219bc6e1fc4d9159f86e3db820e8c7fcaa8d801b98e4285f63f6bd3f4
+  metadata.gz: c40927eb7a63d40a2fd77676e5a3c2362d20f3e0601386c3e848f96d631d1ee1101d46619ed8a3f1fea952e3d9a56f0cc9205fe94b115866358bac2baadf3958
+  data.tar.gz: ce24527412963c7c89611d2517ee20790e01efa4dafa5b3c0f6229b7993baaf5c8db2b7e49b378f65d61070390ab0ccf797f7b1cbf1bcfa3ba98f363b6473e21

data/.rubocop.yml

@@ -0,0 +1,61 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.2 # closest to required_ruby_version of '>= 1.8.6'
+
+# Even the reference in the documentation suggests that you should prefer
+# `alias_method` vs `alias`, so I don't understand why that isn't the default.
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
+Style/Documentation:
+  Enabled: false
+
+# Enumerable#each_with_object only available since Ruby v1.9
+Style/EachWithObject:
+  Enabled: false
+
+# Kernel#__dir__ has only been available since Ruby v2.0
+Style/ExpandPathArguments:
+  Enabled: false
+
+# Kernel#format has only supported named references since Ruby v1.9
+Style/FormatStringToken:
+  EnforcedStyle: unannotated
+
+# ruby19 style has only been supported since Ruby v1.9
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+# I'm not keen on this cop, because it's easy to miss the conditional
+# I think the results are particularly unhelpful when Metrics/LineLength is big
+Style/IfUnlessModifier:
+  Enabled: false
+
+# Lambda literal syntax has only been supported since Ruby v2.0
+Style/Lambda:
+  EnforcedStyle: lambda
+
+# Symbol array literal syntax has only been supported since Ruby v2.0
+Style/SymbolArray:
+  Enabled: false
+
+# I'm not keen on this cop, because it's easy to miss the while/until
+Style/WhileUntilModifier:
+  Enabled: false
+
+# This recently introduced cop seems to have stirred up some controversy
+Style/AccessModifierDeclarations:
+  Enabled: false
+
+# Enabling this cop results in an "Infinite loop detected" exception
+Layout/AccessModifierIndentation:
+  Enabled: false
+
+# Allow long comment lines, e.g. YARD documentation
+Metrics/LineLength:
+  IgnoredPatterns: ['\A\s*#']
+
+# It's not possible to set TargetRubyVersion to Ruby < v2.2
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,27 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2019-11-16 18:15:36 +0000 using RuboCop version 0.58.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 57
+Metrics/AbcSize:
+  Max: 26
+
+# Offense count: 23
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 366
+
+# Offense count: 172
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 31
+
+# Offense count: 545
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 180

data/CONTRIBUTING.md

@@ -0,0 +1,7 @@
+* Pull requests are welcomed.
+* Fork the repository.
+* Make your changes in a branch.
+* Add/modify/remove tests as appropriate.
+* Open a pull request based on a branch on your fork.
+* Wait for your pull request build to pass on [Travis CI](https://travis-ci.org/freerange/mocha/pull_requests).
+* Pull requests with failing tests will not be accepted.

data/README.md

@@ -1,12 +1,16 @@
-## Mocha [![build status](https://secure.travis-ci.org/freerange/mocha.png)](https://secure.travis-ci.org/freerange/mocha) [![Gem Version](https://badge.fury.io/rb/mocha.png)](http://badge.fury.io/rb/mocha)
+## Mocha [![Build Status](https://travis-ci.org/freerange/mocha.svg?branch=master)](https://travis-ci.org/freerange/mocha) [![Gem Version](https://badge.fury.io/rb/mocha.svg)](http://badge.fury.io/rb/mocha) [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=mocha&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=mocha&package-manager=bundler&version-scheme=semver)
+
 
 ### Description
 
-* A Ruby library for mocking and stubbing.
+* A Ruby library for [mocking](http://xunitpatterns.com/Mock%20Object.html) and [stubbing](http://xunitpatterns.com/Test%20Stub.html) - but deliberately not (yet) [faking](http://xunitpatterns.com/Fake%20Object.html) or [spying](http://xunitpatterns.com/Test%20Spy.html).
 * A unified, simple and readable syntax for both full & partial mocking.
 * Built-in support for MiniTest and Test::Unit.
 * Supported by many other test frameworks.
 
+### Intended Usage
+Mocha is intended to be used in unit tests for the [Mock Object](http://xunitpatterns.com/Mock%20Object.html) or [Test Stub](http://xunitpatterns.com/Test%20Stub.html) types of [Test Double](http://xunitpatterns.com/Test%20Double.html), not the [Fake Object](http://xunitpatterns.com/Fake%20Object.html) or [Test Spy](http://xunitpatterns.com/Test%20Spy.html) types. Although it would be possible to extend Mocha to allow the implementation of fakes and spies, we have chosen to keep it focused on mocks and stubs.
+
 ### Installation
 
 #### Gem
@@ -17,47 +21,95 @@ Install the latest version of the gem with the following command...
 
 Note: If you are intending to use Mocha with Test::Unit or MiniTest, you should only setup Mocha *after* loading the relevant test library...
 
-    require "test/unit"
-    require "mocha/setup"
+##### Test::Unit
+
+```ruby
+require 'rubygems'
+gem 'mocha'
+require 'test/unit'
+require 'mocha/test_unit'
+```
+
+##### MiniTest
+
+```ruby
+require 'rubygems'
+gem 'mocha'
+require 'minitest/unit'
+require 'mocha/minitest'
+```
 
 #### Bundler
 
 If you're using Bundler, include Mocha in the `Gemfile` and then setup Mocha later once you know the test library has been loaded...
 
-    # Gemfile
-    gem "mocha"
+##### Test::Unit
 
-    # Elsewhere after Bundler has loaded gems
-    require "test/unit"
-    require "mocha/setup"
+```ruby
+# Gemfile
+gem "mocha"
+
+# Elsewhere after Bundler has loaded gems e.g. after `require 'bundler/setup'`
+require "test/unit"
+require "mocha/test_unit"
+```
+
+##### MiniTest
+
+```ruby
+# Gemfile
+gem "mocha"
+
+# Elsewhere after Bundler has loaded gems e.g. after `require 'bundler/setup'`
+require "minitest/unit"
+require "mocha/minitest"
+```
 
 #### Rails
 
 If you're loading Mocha using Bundler within a Rails application, you should setup Mocha manually e.g. at the bottom of your `test_helper.rb`.
 
-    # Gemfile in Rails app
-    gem "mocha"
+##### MiniTest
+
+```ruby
+# Gemfile in Rails app
+gem 'mocha'
 
-    # At bottom of test_helper.rb
-    require "mocha/setup"
+# At bottom of test_helper.rb (or at least after `require 'rails/test_help'`)
+require 'mocha/minitest'
+```
 
-#### Rails Plugin
+##### RSpec
 
-Install the Rails plugin...
+RSpec includes a mocha adapter. Just tell RSpec you want to mock with `:mocha`:
 
-    $ rails plugin install git://github.com/freerange/mocha.git
+```ruby
+# Gemfile in Rails app
+gem 'mocha'
 
-Note: As of version 0.9.8, the Mocha plugin is not automatically setup at plugin load time. Instead it must be manually setup e.g. at the bottom of your `test_helper.rb`.
+# Within `spec/spec_helper.rb`
+RSpec.configure do |config|
+  config.mock_with :mocha
+end
+```
 
-    # At bottom of test_helper.rb
-    require "mocha/setup"
+Note: There is no need to use a require statement to setup Mocha; RSpec does this itself.
 
-#### Know Issues
+##### MiniTest
 
+```ruby
+# At bottom of test_helper.rb (or at least after `require 'rails/test_help'`)
+require 'mocha/minitest'
+```
+
+#### Known Issues
+
+* In Mocha v1.2.0 there is a scenario where stubbing a class method originally defined in a module hangs the Ruby interpreter due to [a bug in Ruby v2.3.1](https://bugs.ruby-lang.org/issues/12832). See #272. This was fixed in Mocha v1.2.1.
+* Since v1.1.0 Mocha has used prepended modules internally for stubbing methods. There is [an obscure Ruby bug](https://bugs.ruby-lang.org/issues/12876) in many (but not all) versions of Ruby between v2.0 & v2.3 which under certain circumstances may cause your Ruby interpreter to hang. See the Ruby bug report for more details. The bug has been fixed in Ruby v2.3.3 & v2.4.0.
+* Stubbing an aliased class method, where the original method is defined in a module that's used to `extend` the class doesn't work in Ruby 1.8.x. See stub_method_defined_on_module_and_aliased_test.rb for an example of this behaviour.
 * 0.13.x versions cause a harmless, but annoying, deprecation warning when used with Rails 3.2.0-3.2.12, 3.1.0-3.1.10 & 3.0.0-3.0.19.
 * 0.11.x versions don't work with Rails 3.2.13 (`TypeError: superclass mismatch for class ExpectationError`). See #115.
 * Versions 0.10.2, 0.10.3 & 0.11.0 of the Mocha gem were broken. Please do not use these versions.
-* Versions 0.9.6 & 0.9.7 of the Mocha Rails plugin were broken. Please do not use these versions.
 
 ### Usage
 
@@ -65,7 +117,7 @@ Note: As of version 0.9.8, the Mocha plugin is not automatically setup at plugin
 
 ```ruby
 require 'test/unit'
-require 'mocha/setup'
+require 'mocha/test_unit'
 
 class MiscExampleTest < Test::Unit::TestCase
   def test_mocking_a_class_method
@@ -121,7 +173,7 @@ class Enterprise
 end
 
 require 'test/unit'
-require 'mocha/setup'
+require 'mocha/test_unit'
 
 class EnterpriseTest < Test::Unit::TestCase
   def test_should_boldly_go
@@ -155,7 +207,7 @@ class Order
     def find_all
       # Database.connection.execute('select * from orders...
     end
-  
+
     def number_shipped_since(date)
       find_all.select { |order| order.shipped_on > date }.length
     end
@@ -167,7 +219,7 @@ class Order
 end
 
 require 'test/unit'
-require 'mocha/setup'
+require 'mocha/test_unit'
 
 class OrderTest < Test::Unit::TestCase
   # illustrates stubbing instance method
@@ -198,7 +250,15 @@ end
 
 ### Thread safety
 
-Mocha is currently *not* thread-safe. There are two main reasons for this: (a) in multi-threaded code Mocha exceptions may be raised in a thread other than the one which is running the test and thus a Mocha exception may not be correctly intercepted by Mocha exception handling code; and (b) partial mocking changes the state of objects in the `ObjectSpace` which is shared across all threads in the Ruby process and this access to what is effectively global state is not synchronized.
+Mocha currently *does not* attempt to be thread-safe.
+
+#### Can I test multi-threaded code with Mocha?
+
+The short answer is no. In multi-threaded code Mocha exceptions may be raised in a thread other than the one which is running the test and thus a Mocha exception may not be correctly intercepted by Mocha exception handling code.
+
+#### Can I run my tests across multiple threads?
+
+Maybe, but probably not. Partial mocking changes the state of objects in the `ObjectSpace` which is shared across all threads in the Ruby process and this access to what is effectively global state is not synchronized. So, for example, if two tests are running concurrently and one uses `#any_instance` to modify a class, both tests will see those changes immediately.
 
 ### Expectation matching / invocation order
 
@@ -206,11 +266,27 @@ Stubs and expectations are basically the same thing. A stub is just an expectati
 
 When a method is invoked on a mock object, the mock object searches through its expectations from newest to oldest to find one that matches the invocation. After the invocation, the matching expectation might stop matching further invocations.
 
-See the [documentation](http://gofreerange.com/mocha/docs/Mocha/Mock.html) for `Mocha::Mock` for further details.
+See the [documentation](https://mocha.jamesmead.org/Mocha/Mock.html) for `Mocha::Mock` for further details.
+
+### Configuration
+
+If you want, Mocha can generate a warning or raise an exception when:
+
+* stubbing a method unnecessarily
+* stubbing method on a non-mock object
+* stubbing a non-existent method
+* stubbing a non-public method
+
+See the [documentation](https://mocha.jamesmead.org/Mocha/Configuration.html) for `Mocha::Configuration` for further details.
+
+##### MOCHA_OPTIONS
+`MOCHA_OPTIONS` is an environment variable whose value can be set to a comma-separated list, so that we can specify multiple options e.g. `MOCHA_OPTIONS=debug,use_test_unit_gem`.
+Only the following values are currently recognized and have an effect:
+* `debug`: Enables a debug mode which will output backtraces for each deprecation warning. This is useful for finding where in the test suite the deprecated calls are.
 
 ### Useful Links
 
-* [Official Documentation](http://gofreerange.com/mocha/docs/)
+* [Official Documentation](https://mocha.jamesmead.org)
 * [Source Code](http://github.com/freerange/mocha)
 * [Mailing List](http://groups.google.com/group/mocha-developer)
 * [James Mead's Blog](http://jamesmead.org/blog/)
@@ -220,25 +296,43 @@ See the [documentation](http://gofreerange.com/mocha/docs/Mocha/Mock.html) for `
 * [Mock Roles Not Objects](http://www.jmock.org/oopsla2004.pdf)
 * [jMock](http://www.jmock.org/)
 
-### Contributing
-
-* Fork the repository.
-* Make your changes in a branch.
-* Add tests for new behaviour. Modify existing tests for changes to existing behaviour.
-* Run `bin/build-matrix` from the root directory and ensure all the tests pass.
-  * This script depends on `rbenv` being installed.
-  * You must have all the ruby versions listed in `.travis.yml` under the `rvm` key installed (currently 1.8.7, 1.9.3 & 2.0.0).
-  * I use `rbenv-aliases` to alias the patch versions.
-  * Note that the build matrix takes quite a while to run.
-* Send us a pull request from your fork/branch.
-
 ### Contributors
 
 See this [list of contributors](https://github.com/freerange/mocha/graphs/contributors).
 
-### Translations
+### Releasing a new version
+
+* Update the RELEASE.md file with a summary of changes
+* Bump the version in `lib/mocha/version.rb`
+* Commit & push to GitHub
+* Check Travis CI build is passing - https://travis-ci.org/freerange/mocha
+
+* Sign in to Google Analytics - https://analytics.google.com/analytics/web/
+* Find the web property ID for floehopper (625523) > Mocha Documentation (UA-625523-7)
+* Generate documentation:
+
+```bash
+$ MOCHA_GENERATE_DOCS=true bundle install
 
-* [Serbo-Croatian](http://science.webhostinggeeks.com/mocha) by [WHG Team](http://webhostinggeeks.com/).
+$ MOCHA_GENERATE_DOCS=true GOOGLE_ANALYTICS_WEB_PROPERTY_ID=UA-625523-7 rake generate_docs
+```
+* Commit documentation & push to GitHub
+* Sign in to rubygems.org and find API key - https://rubygems.org/profile/edit
+
+```bash
+$ curl -u james@floehopper.org https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials; chmod 0600 ~/.gem/credentials`
+```
+
+* Release gem to Rubygems:
+
+```bash
+$ rake release
+[runs tests]
+mocha 1.2.0 built to pkg/mocha-1.2.0.gem.
+Tagged v1.2.0.
+Pushed git commits and tags.
+Pushed mocha 1.2.0 to rubygems.org.
+```
 
 ### History
 

data/RELEASE.md

@@ -1,7 +1,155 @@
 # Release Notes
 
-## 1.0.0.alpha
-
+## 1.10.0.alpha
+
+### External changes
+
+* Remove dependency on metaclass gem (#49, #365)
+* Accept symbol (as well as a string) as mock/stub name - thanks to @nitishr (#347, #353, #377)
+* More realistic examples in documentation for `Expectation#yields` and `#multiple_yields` - thanks to @nitishr (#352, #383)
+* Improve documentation for `Mock#responds_like` & `#responds_like_instance_of` - thanks to @nitishr (#337, #384)
+* Make `Expectation#yields` & `Expectation#multiple_yields` fail when the caller of the stubbed method does not provide a block. This is a change to an undocumented aspect of the public API's behaviour. If this causes your tests to fail, then fix it by removing the unnecessary call to `Expectation#yields` or `Expectation#multiple_yields` - thanks to @nitishr (#382)
+* Document `MOCHA_OPTIONS` in README - thanks to @nitishr (#311, #386)
+* Add documentation to explain how Mocha is intended to be used - thanks to @nitishr (#330, #385)
+* Deprecation warning if integration using 'mocha/test_unit' or 'mocha/minitest' fails - thanks to @nitishr (#229, #389, c6032d0b)
+* Require at least one specified sequence for `Expectation#in_sequence` - thanks to @nitishr (#79, #396, 9020248a)
+* Make signatures of `Mock#unstub` & `ObjectMethods#unstub` consistent - thanks to @nitishr (#397, f04d437)
+* Deprecate requiring 'mocha/setup' (36adf880)
+* Optionally display matching invocations alongside expectations - thanks to @nitishr (#178, #394, 00f0540, #410)
+* Put deprecations into effect (#400, #418):
+  * Remove deprecated 'mocha_standalone.rb' & 'mocha/standalone.rb'
+  * Fail fast if no test library loaded
+  * Removed optional block for `Mocha::API#mock`, `#stub` & `#stub_everything`
+  * Remove deprecated `ParameterMatchers#has_equivalent_query_string` method
+  * Remove deprecated 'mocha/mini_test.rb'
+* Fix typo in docs for `Mocha::Configuration.prevent` (266ce71c)
+* New-style configuration (see documentation for `Mocha::Configuration`) (#407, #421)
+* Deprecate support for Ruby versions earlier than v1.9 (#325, c5f8496d)
+* Deprecate support for versions of test-unit & minitest which need monkey-patching (a34e1a88)
+* Deprecate old-style Rails plugin (#403, 2df77134)
+* Documentation fixes & improvements which also fix YARD warnings (472d5416, a2c0d64a)
+
+### Internal changes
+
+* Pin minitest to v5.11.3 for Ruby v1.8.7 to fix build; minitest no longer supports Ruby v1.8.7 (4a0a580)
+* Upgrade JRuby to v9.2.8.0 in Travis CI builds (aa29b3f)
+* Only run rubocop for MRI Ruby versions & non-integration test builds (8f1c6af)
+* Reduce duplication in any instance method class - thanks to @nitishr (#378)
+* Simplify `AnyInstanceMethod`, `ClassMethod`, `InstanceMethod`, `ModuleMethod` class hierarchy - thanks to @nitishr (#381)
+* Simplify `ClassMethods#method_exists?` & `ObjectMethods#method_exists?` making them consistent - thanks to @nitishr (#270, #362, #370)
+* Don't override definition of `singleton_class` in `ClassMethods` - thanks to @nitishr (#391, #392)
+* Do not include 'method_definer' methods into all objects (#268, #402)
+* Distinguish different `ObjectMethods` modules (#268, #404)
+* Pass invocation to expectation list methods - thanks to @nitishr (#408, #409, #411)
+* Consistently use `assert_raises` - thanks to @nitishr (#405, #412, a66b7bed)
+* Update Ruby & JRuby versions in Travis CI config (18cb1a93, eb061c53)
+* Rubocop improvements (aa16ea67...6f4db70b, 2a1240e6...e95716ae)
+* Fix inconsistency in CardinalityTest (aa10e0a8)
+* Fix test failures on Mac OSX Catalina - thanks to @nitishr (#413, #417, #419, 8a0f2535)
+* Remove default argument in `Expectation#invoke` - thanks to @nitishr (#414, #420)
+
+## 1.9.0
+
+* Add TruffleRuby to Travis CI build matrix - thanks to @deepj (#354)
+* Explicitly set Travis CI OS to Ubuntu Trusty 14.04 (ded1fa45)
+* Expand explanation of thread-safety concerns - thanks to @techbelly (#357)
+* Refactor class method and any instance method - thanks to @chrisroos (#358)
+* Rely on default bundler version in Travis CI builds (3352e9c5)
+* Fix local build-matrix script (11abe231)
+* No need to install latest bundler in build-matrix script (8247a894)
+
+## 1.8.0
+
+* Constrain rubocop version to avoid breaking Travis CI builds (05e507f5)
+* Avoid calling Kernel#format from ObjectMethods#mocha_inspect - thanks to @hoffmanilya (#345)
+* Fix build matrix script (#346)
+* Avoid deprecation warning in gemspec (4976e0bc)
+* Removed link to documentation translation (ef428ea2)
+* Don't use the new bundler v2 in builds (683ded9b)
+* Moved documentation from https://gofreerange.com/mocha/docs to https://mocha.jamesmead.org/ [683ded...a17fde](https://github.com/freerange/mocha/compare/683ded...a17fde)
+
+## 1.7.0
+
+* Update Ruby & JRuby versions in Travis CI config (9bf55631 & 3883af7e)
+* Simplify gemspec (63744f86)
+* Add rubocop and fix most cop violations (#341)
+* Use Kernel#warn for deprecations - thanks to @etiennebarrie (#333, 196970a)
+
+## 1.6.0
+
+* Fix subtle bug in setting correct visibility of stubbed module methods on `Kernel` or `Object` - thanks to @chrisroos (#295)
+* Avoid mocks for partial mocking leaking into subsequent tests - thanks to @skliew for reporting (#331)
+* Remove OpenCollective badge, backers & sponsors (a283a079)
+* Change gem version badge to SVG format and add SemVer stability badge - thanks to @greysteil (#335)
+* Improve documentation for Configuration (#236)
+
+## 1.5.0
+
+* Prevent use of Mocha outside the context of a test/example - thanks to @andyw8 & @lzap (#327)
+
+## 1.4.0
+
+* Fix deprecation warning for `assert_nil` in `ClassMethodTest` (#308 & #309)
+* Display file and line number in deprecation warning - thanks to @chrisarcand (#310, #312 & #313)
+* Rename `mocha/mini_test.rb` to `mocha/minitest.rb` - thanks to @grosser (#320 & #322)
+* Fix warning when delegating to mock in Ruby 2.4 - thanks to @tjvc (#321 & #323)
+* Updates to Travis CI configuration ([73af600..9732726](https://github.com/freerange/mocha/compare/73af600...9732726) & 0426e5e)
+
+## 1.3.0
+
+* Ensure all tests run individually - thanks to @chrisroos (#267)
+* Update Travis CI build status badge to show master branch status (#264)
+* Correct RSpec section of the README - thanks to @myronmarston (0cc039c8)
+* Fix pretty printing of quotes in `String#mocha_inspect` (#215 & #223)
+* Add release instructions to README - thanks to @chrisroos (70a5febd & 3c664df7)
+* Require at least Ruby v1.8.7 in gemspec - thanks to @knappe (3e20be8e)
+* Remove redundant InstanceMethod#method_exists? - thanks to @chrisroos (8f58eddf)
+* Reduce risk of hitting bug 12832 in Ruby v2.3 - thanks to @chrisroos (#277 & eca7560c)
+* Fix JRuby build - thanks to @headius (jruby/jruby#4250) & @chrisroos (#274)
+* Add latest stable version of JRuby to Travis CI build matrix (#288)
+* Fix Ruby v1.8.7 builds on Travis CI (928b5a40 & 460dce5b)
+* Deprecate passing block to mock object constructor (#290)
+* Add a known issue to README for Ruby bug 12876 (#276)
+* Add Ruby 2.4 and ruby-head to Travis CI build matrix - thanks to @junaruga (#297)
+* Fix `Mocha::ParameterMatchers#includes` for `Array` values - thanks to @timcraft (#302)
+* Use faster container-based virtual environments for Travis CI builds (#305)
+* Rename `Mocha::ParameterMatchers::QueryStringMatches` to `QueryString` (#306)
+* Handle blank parameter value for query string matcher - thanks to @weynsee (#303 & #304)
+* Rename `Mocha::ParameterMatchers::QueryString` -> `EquivalentUri` (#307)
+* Use `do ... end` instead of `{ ... }` in acceptance tests - thanks to @chrisroos (#294)
+
+## 1.2.1
+
+* Fixed #272. Workaround Ruby bug 12832 which caused interpreter to hang. See https://bugs.ruby-lang.org/issues/12832. Thanks to @chrisroos & @petems (6f1c8b9b, #273).
+
+## 1.2.0
+
+* Always use prepended module to stub class & instance methods for Ruby v2+ - thanks to @grosser & @chrisroos (43d56671, #244)
+* Always use prepended module to stub AnyInstance methods in Ruby v2+ - thanks to @chrisroos (#262)
+* Always set visibility of stub method to match stubbed method on included module - thanks to @grosser & @chrisroos (e87c03b0, #248)
+* Always set visibility to stub method to match stubbed method on superclass - thanks to @chrisroos (38d902ad)
+* Allow stubbing of method to which any instance responds (#200)
+* Allow `includes` matcher to take matcher arguments - thanks to @lazyatom (#217)
+* Avoid exception in older version of Rubygems - thanks to @chrisroos (78d930a7)
+* Add licenses to gemspec as requested by @coreyhaines (#201)
+* Fix typo in README - thanks to @jaredbeck (6119460d)
+* Added section about using Mocha with RSpec & Rails to README (#221)
+* Fix documentation for Mocha::API#stub method - thanks to @raeno (599b1dcd)
+* Added backers and sponsors from OpenCollective - thanks to @piamancini (#253)
+* Fix typo in docs for equals - thanks to @alexcoco (#254)
+* Add known issue for Ruby v1.8 to README - thanks to @chrisroos (2c642096)
+
+## 1.1.0
+
+* Set visibility of any instance stub method.
+* Stub methods with a prepended method if there are other prepended methods. Thanks to @mrsimo.
+* Improve docs for `Mock#responds_like` & `#responds_like_instance_of`.
+* Use GitHub convention for instructions on contributing to Mocha.
+* Fix typos in docs. Thanks to @10io
+
+## 1.0.0
+
+### External changes
 * Assume 'mocha' has been required when requiring 'mocha/setup'.
 * Provide shortcuts for integrating with specific test library i.e. `require 'mocha/test_unit'` or `require 'mocha/mini_test'`
 as alternatives to `require 'mocha/setup'`.
@@ -13,8 +161,20 @@ Note: this may break existing tests which rely on the old behaviour. Stubbing a
 method on a child class would previously cause an unexpected invocation error. By searching up through the inheritance
 hierarchy for each of the delegate mock objects, we can provide more intuitive behaviour. Instead of an unexpected invocation
 error, invoking the method on the child class will cause the stubbed method on the superclass to be used.
-* Run the standard test suite against Ruby 2.1.0 in the build matrix.
 * Avoid recursion when constructing unexpected invocation message. Fixes #168.
+* Add explanation of method dispatch. Heavily based on the relevant jMock v1 documentation. Fixes #172.
+* Make class_eval line number more accurate. This sets the line number as the line number of the `def` statement. Closes #169.
+* Allow nesting of `responds_with` parameter matcher. Closes #166.
+* Define `Mocha` module before it's referenced. The test helper defines a class `TestCase` within the `Mocha` module. When
+running the tests inside the bundle, the `Mocha` module happens to be defined at this point. However when running the tests outside the bundle, it is not defined and so an exception is raised: `uninitialized constant Mocha (NameError)`. Fixes #163.
+* Document lack of thread-safety. Fixes #154.
+* Document how to use the build-matrix script. Fixes #160.
+* Stubbing non-public method should use same visibility. This will probably break some existing tests that were somehow relying
+on the stubbed method being public while the original method was protected or private. Fixes #150.
+
+### Internal changes
+* Use lastest Rubygems in Travis CI builds.
+* Run the standard test suite against Ruby 2.1.0 in the build matrix.
 * Run integration tests against Ruby 2.0.0 with latest Test::Unit gem in the build matrix.
 * Test::Unit is not available in Ruby v1.9.3 standard library, so remove it from the build matrix.
 * Force use of Test::Unit runner, etc in relevant integration tests. Prior to this, I don't think we were really testing the
@@ -25,20 +185,10 @@ MiniTest gem was not loaded.
 * Reset environment variables between build matrix builds.
 * Only activate integration with relevant test library for each of the integration tests.
 * Include standard build combinations from Travis CI config i.e. builds using standard library versions of test libraries.
-* Add explanation of method dispatch. Heavily based on the relevant jMock v1 documentation. Fixes #172.
-* Make class_eval line number more accurate. This sets the line number as the line number of the `def` statement. Closes #169.
-* Allow nesting of `responds_with` parameter matcher. Closes #166.
-* Define `Mocha` module before it's referenced. The test helper defines a class `TestCase` within the `Mocha` module. When
-running the tests inside the bundle, the `Mocha` module happens to be defined at this point. However when running the tests outside the bundle, it is not defined and so an exception is raised: `uninitialized constant Mocha (NameError)`. Fixes #163.
-* Document lack of thread-safety. Fixes #154.
-* Document how to use the build-matrix script. Fixes #160.
-* Stubbing non-public method should use same visibility. This will probably break some existing tests that were somehow relying
-on the stubbed method being public while the original method was protected or private. Fixes #150.
-* Remove ruby version map from build matrix script. I'm using the `rbenv-aliases` plugin to alias minor versions to the
-relevant patch version.
 * Fix `build-matrix.rb` script. Also use `.travis.yml` to decide what combinations to run. This means we
 can now simulate the Travis CI build locally and avoid duplication. Fixes #157.
-
+* Remove Ruby version map from build matrix script. I'm using the `rbenv-aliases` plugin to alias minor versions to the
+relevant patch version.
 
 ## 0.14.0
 
@@ -363,7 +513,7 @@ Hash with wrong number of entries.
 
 ## 0.5.0
 
-- Parameter Matchers - I’ve added a few Hamcrest-style parameter matchers which are designed to be used inside Expectation#with. The following matchers are currently available: anything(), includes(), has_key(), has_value(), has_entry(), all_of() & any_of(). More to follow soon. The idea is eventually to get rid of the nasty parameter_block option on Expectation#with.
+- Parameter Matchers - I've added a few Hamcrest-style parameter matchers which are designed to be used inside Expectation#with. The following matchers are currently available: anything(), includes(), has_key(), has_value(), has_entry(), all_of() & any_of(). More to follow soon. The idea is eventually to get rid of the nasty parameter_block option on Expectation#with.
 
   object = mock()
   object.expects(:method).with(has_key('key_1'))