Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename mocha/mini_test.rb to mocha/minitest.rb #322

Merged
merged 1 commit into from Feb 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -33,7 +33,7 @@ require 'mocha/test_unit'
require 'rubygems'
gem 'mocha'
require 'minitest/unit'
require 'mocha/mini_test'
require 'mocha/minitest'
```

#### Bundler
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions 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'
3 changes: 3 additions & 0 deletions lib/mocha/minitest.rb
@@ -0,0 +1,3 @@
require "mocha/integration/mini_test"

Mocha::Integration::MiniTest.activate
2 changes: 1 addition & 1 deletion 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
Expand Down