Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit ac7b9cf

Browse files
committed
Remove support for Mocha version < 1.0
Mocha 1.0 is 7 years old now https://rubygems.org/gems/mocha/versions/1.0.0
1 parent 61f8d25 commit ac7b9cf

File tree

2 files changed

+3
-31
lines changed

2 files changed

+3
-31
lines changed

Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Breaking Changes:
2323
`alias_it_should_behave_like_to` configuration option. (Phil Pirozhkov, #2864)
2424
* Remove deprecated `treat_symbols_as_metadata_keys_with_true_values` configuration
2525
option. (Phil Pirozhkov, #2864)
26+
* Remove support for Mocha version < 1.0. (Phil Pirozhkov, #2864)
2627

2728
Enhancements:
2829

lib/rspec/core/mocking_adapters/mocha.rb

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,4 @@
1-
# In order to support all versions of mocha, we have to jump through some
2-
# hoops here.
3-
#
4-
# mocha >= '0.13.0':
5-
# require 'mocha/api' is required.
6-
# require 'mocha/object' raises a LoadError b/c the file no longer exists.
7-
# mocha < '0.13.0', >= '0.9.7'
8-
# require 'mocha/api' is required.
9-
# require 'mocha/object' is required.
10-
# mocha < '0.9.7':
11-
# require 'mocha/api' raises a LoadError b/c the file does not yet exist.
12-
# require 'mocha/standalone' is required.
13-
# require 'mocha/object' is required.
14-
begin
15-
require 'mocha/api'
16-
17-
begin
18-
require 'mocha/object'
19-
rescue LoadError
20-
# Mocha >= 0.13.0 no longer contains this file nor needs it to be loaded.
21-
end
22-
rescue LoadError
23-
require 'mocha/standalone'
24-
require 'mocha/object'
25-
end
1+
require 'mocha/api'
262

273
module RSpec
284
module Core
@@ -33,12 +9,7 @@ def self.framework_name
339
:mocha
3410
end
3511

36-
# Mocha::Standalone was deprecated as of Mocha 0.9.7.
37-
begin
38-
include ::Mocha::API
39-
rescue NameError
40-
include ::Mocha::Standalone
41-
end
12+
include ::Mocha::API
4213

4314
def setup_mocks_for_rspec
4415
mocha_setup

0 commit comments

Comments
 (0)