File tree Expand file tree Collapse file tree 5 files changed +13
-6
lines changed Expand file tree Collapse file tree 5 files changed +13
-6
lines changed Original file line number Diff line number Diff line change @@ -120,7 +120,8 @@ def method_name
120
120
end
121
121
end
122
122
123
- module TestUnitAssertionAdapter
123
+ # @private
124
+ module MinitestAssertionAdapter
124
125
extend ActiveSupport ::Concern
125
126
126
127
module ClassMethods
@@ -160,5 +161,11 @@ def assertion_delegator
160
161
define_assertion_delegators
161
162
end
162
163
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
163
170
end
164
171
end
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ module RailsExampleGroup
8
8
extend ActiveSupport ::Concern
9
9
include RSpec ::Rails ::SetupAndTeardownAdapter
10
10
include RSpec ::Rails ::MinitestLifecycleAdapter if ::Rails ::VERSION ::STRING >= '4'
11
- include RSpec ::Rails ::TestUnitAssertionAdapter
11
+ include RSpec ::Rails ::MinitestAssertionAdapter
12
12
include RSpec ::Rails ::Matchers
13
13
end
14
14
end
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ module FixtureSupport
5
5
extend ActiveSupport ::Concern
6
6
include RSpec ::Rails ::SetupAndTeardownAdapter
7
7
include RSpec ::Rails ::MinitestLifecycleAdapter if ::ActiveRecord ::VERSION ::STRING > '4'
8
- include RSpec ::Rails ::TestUnitAssertionAdapter
8
+ include RSpec ::Rails ::MinitestAssertionAdapter
9
9
include ActiveRecord ::TestFixtures
10
10
11
11
included do
Original file line number Diff line number Diff line change 1
1
require "spec_helper"
2
2
3
- describe RSpec ::Rails ::TestUnitAssertionAdapter do
4
- include RSpec ::Rails ::TestUnitAssertionAdapter
3
+ describe RSpec ::Rails ::MinitestAssertionAdapter do
4
+ include RSpec ::Rails ::MinitestAssertionAdapter
5
5
6
6
RSpec ::Rails ::Assertions . public_instance_methods . select { |m | m . to_s =~ /^(assert|flunk|refute)/ } . each do |m |
7
7
if m . to_s == "assert_equal"
Original file line number Diff line number Diff line change 361
361
362
362
describe "ActiveModel Lint tests" do
363
363
require 'active_model/lint'
364
- include RSpec ::Rails ::TestUnitAssertionAdapter
364
+ include RSpec ::Rails ::MinitestAssertionAdapter
365
365
include ActiveModel ::Lint ::Tests
366
366
367
367
# to_s is to support ruby-1.9
You can’t perform that action at this time.
0 commit comments