Skip to content

Commit 2325288

Browse files
committed
Minitest is the 'future' ... let's just use that name everywhere
1 parent c352b3b commit 2325288

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

lib/rspec/rails/adapters.rb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ def method_name
120120
end
121121
end
122122

123-
module TestUnitAssertionAdapter
123+
# @private
124+
module MinitestAssertionAdapter
124125
extend ActiveSupport::Concern
125126

126127
module ClassMethods
@@ -160,5 +161,11 @@ def assertion_delegator
160161
define_assertion_delegators
161162
end
162163
end
164+
165+
# Backwards compatibility. It's unlikely that anyone is using this
166+
# constant, but we had forgotten to mark it as `@private` earlier
167+
#
168+
# @private
169+
TestUnitAssertionAdapter = MinitestAssertionAdapter
163170
end
164171
end

lib/rspec/rails/example/rails_example_group.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module RailsExampleGroup
88
extend ActiveSupport::Concern
99
include RSpec::Rails::SetupAndTeardownAdapter
1010
include RSpec::Rails::MinitestLifecycleAdapter if ::Rails::VERSION::STRING >= '4'
11-
include RSpec::Rails::TestUnitAssertionAdapter
11+
include RSpec::Rails::MinitestAssertionAdapter
1212
include RSpec::Rails::Matchers
1313
end
1414
end

lib/rspec/rails/fixture_support.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module FixtureSupport
55
extend ActiveSupport::Concern
66
include RSpec::Rails::SetupAndTeardownAdapter
77
include RSpec::Rails::MinitestLifecycleAdapter if ::ActiveRecord::VERSION::STRING > '4'
8-
include RSpec::Rails::TestUnitAssertionAdapter
8+
include RSpec::Rails::MinitestAssertionAdapter
99
include ActiveRecord::TestFixtures
1010

1111
included do

spec/rspec/rails/assertion_adapter_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require "spec_helper"
22

3-
describe RSpec::Rails::TestUnitAssertionAdapter do
4-
include RSpec::Rails::TestUnitAssertionAdapter
3+
describe RSpec::Rails::MinitestAssertionAdapter do
4+
include RSpec::Rails::MinitestAssertionAdapter
55

66
RSpec::Rails::Assertions.public_instance_methods.select{|m| m.to_s =~ /^(assert|flunk|refute)/}.each do |m|
77
if m.to_s == "assert_equal"

spec/rspec/rails/mocks/mock_model_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@
361361

362362
describe "ActiveModel Lint tests" do
363363
require 'active_model/lint'
364-
include RSpec::Rails::TestUnitAssertionAdapter
364+
include RSpec::Rails::MinitestAssertionAdapter
365365
include ActiveModel::Lint::Tests
366366

367367
# to_s is to support ruby-1.9

0 commit comments

Comments
 (0)