Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Minitest is the 'future' ... let's just use that name everywhere

  • Loading branch information...
commit 23252887b19b659493779bbed6bf0910b49d66da 1 parent c352b3b
@alindeman alindeman authored
View
9 lib/rspec/rails/adapters.rb
@@ -120,7 +120,8 @@ def method_name
end
end
- module TestUnitAssertionAdapter
+ # @private
+ module MinitestAssertionAdapter
extend ActiveSupport::Concern
module ClassMethods
@@ -160,5 +161,11 @@ def assertion_delegator
define_assertion_delegators
end
end
+
+ # Backwards compatibility. It's unlikely that anyone is using this
+ # constant, but we had forgotten to mark it as `@private` earlier
+ #
+ # @private
+ TestUnitAssertionAdapter = MinitestAssertionAdapter
end
end
View
2  lib/rspec/rails/example/rails_example_group.rb
@@ -8,7 +8,7 @@ module RailsExampleGroup
extend ActiveSupport::Concern
include RSpec::Rails::SetupAndTeardownAdapter
include RSpec::Rails::MinitestLifecycleAdapter if ::Rails::VERSION::STRING >= '4'
- include RSpec::Rails::TestUnitAssertionAdapter
+ include RSpec::Rails::MinitestAssertionAdapter
include RSpec::Rails::Matchers
end
end
View
2  lib/rspec/rails/fixture_support.rb
@@ -5,7 +5,7 @@ module FixtureSupport
extend ActiveSupport::Concern
include RSpec::Rails::SetupAndTeardownAdapter
include RSpec::Rails::MinitestLifecycleAdapter if ::ActiveRecord::VERSION::STRING > '4'
- include RSpec::Rails::TestUnitAssertionAdapter
+ include RSpec::Rails::MinitestAssertionAdapter
include ActiveRecord::TestFixtures
included do
View
4 spec/rspec/rails/assertion_adapter_spec.rb
@@ -1,7 +1,7 @@
require "spec_helper"
-describe RSpec::Rails::TestUnitAssertionAdapter do
- include RSpec::Rails::TestUnitAssertionAdapter
+describe RSpec::Rails::MinitestAssertionAdapter do
+ include RSpec::Rails::MinitestAssertionAdapter
RSpec::Rails::Assertions.public_instance_methods.select{|m| m.to_s =~ /^(assert|flunk|refute)/}.each do |m|
if m.to_s == "assert_equal"
View
2  spec/rspec/rails/mocks/mock_model_spec.rb
@@ -361,7 +361,7 @@
describe "ActiveModel Lint tests" do
require 'active_model/lint'
- include RSpec::Rails::TestUnitAssertionAdapter
+ include RSpec::Rails::MinitestAssertionAdapter
include ActiveModel::Lint::Tests
# to_s is to support ruby-1.9
Please sign in to comment.
Something went wrong with that request. Please try again.