From 55d66ed4f5e6cad95e1605341ec3c608be2c6833 Mon Sep 17 00:00:00 2001
From: James Mead <james@floehopper.org>
Date: Sun, 11 Feb 2018 15:59:12 +0000
Subject: [PATCH] Rename mocha/mini_test.rb to mocha/minitest.rb

* Deprecate requiring 'mocha/mini_test'
* Update documentation in README
---
 README.md                          | 8 ++++----
 lib/mocha/mini_test.rb             | 6 ++++--
 lib/mocha/minitest.rb              | 3 +++
 test/integration/mini_test_test.rb | 2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 lib/mocha/minitest.rb

diff --git a/README.md b/README.md
index 06554a036..79a4f64ec 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ require 'mocha/test_unit'
 require 'rubygems'
 gem 'mocha'
 require 'minitest/unit'
-require 'mocha/mini_test'
+require 'mocha/minitest'
 ```
 
 #### Bundler
@@ -59,7 +59,7 @@ gem "mocha"
 
 # Elsewhere after Bundler has loaded gems e.g. after `require 'bundler/setup'`
 require "minitest/unit"
-require "mocha/mini_test"
+require "mocha/minitest"
 ```
 
 #### Rails
@@ -73,7 +73,7 @@ If you're loading Mocha using Bundler within a Rails application, you should set
 gem 'mocha'
 
 # At bottom of test_helper.rb (or at least after `require 'rails/test_help'`)
-require 'mocha/mini_test'
+require 'mocha/minitest'
 ```
 
 ##### RSpec
@@ -104,7 +104,7 @@ Note: As of version 0.9.8, the Mocha plugin is not automatically setup at plugin
 
 ```ruby
 # At bottom of test_helper.rb (or at least after `require 'rails/test_help'`)
-require 'mocha/mini_test'
+require 'mocha/minitest'
 ```
 
 #### Known Issues
diff --git a/lib/mocha/mini_test.rb b/lib/mocha/mini_test.rb
index 441779944..f018f9b87 100644
--- a/lib/mocha/mini_test.rb
+++ b/lib/mocha/mini_test.rb
@@ -1,3 +1,5 @@
-require "mocha/integration/mini_test"
+require 'mocha/deprecation'
 
-Mocha::Integration::MiniTest.activate
+Mocha::Deprecation.warning("`require 'mocha/mini_test'` has been deprecated. Please use `require 'mocha/minitest' instead.")
+
+require 'mocha/minitest'
diff --git a/lib/mocha/minitest.rb b/lib/mocha/minitest.rb
new file mode 100644
index 000000000..441779944
--- /dev/null
+++ b/lib/mocha/minitest.rb
@@ -0,0 +1,3 @@
+require "mocha/integration/mini_test"
+
+Mocha::Integration::MiniTest.activate
diff --git a/test/integration/mini_test_test.rb b/test/integration/mini_test_test.rb
index 33f529cab..c15af4832 100644
--- a/test/integration/mini_test_test.rb
+++ b/test/integration/mini_test_test.rb
@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-require "mocha/mini_test"
+require "mocha/minitest"
 require "integration/shared_tests"
 
 class MiniTestTest < Mocha::TestCase