Revert "MethodCallAssertions is a regular player of the team ActiveSupport::TestCase now"
This reverts commit 98d0f7ebd3
.
This commit is contained in:
parent
6384933994
commit
967beb7229
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
require "action_cable"
|
require "action_cable"
|
||||||
require "active_support/testing/autorun"
|
require "active_support/testing/autorun"
|
||||||
|
require "active_support/testing/method_call_assertions"
|
||||||
|
|
||||||
require "puma"
|
require "puma"
|
||||||
require "rack/mock"
|
require "rack/mock"
|
||||||
|
@ -19,6 +20,8 @@ ActionCable.server.config.cable = { "adapter" => "test" }
|
||||||
ActionCable.server.config.logger = Logger.new(nil)
|
ActionCable.server.config.logger = Logger.new(nil)
|
||||||
|
|
||||||
class ActionCable::TestCase < ActiveSupport::TestCase
|
class ActionCable::TestCase < ActiveSupport::TestCase
|
||||||
|
include ActiveSupport::Testing::MethodCallAssertions
|
||||||
|
|
||||||
def wait_for_async
|
def wait_for_async
|
||||||
wait_for_executor Concurrent.global_io_executor
|
wait_for_executor Concurrent.global_io_executor
|
||||||
end
|
end
|
||||||
|
|
|
@ -16,6 +16,7 @@ module Rails
|
||||||
end
|
end
|
||||||
|
|
||||||
require "active_support/testing/autorun"
|
require "active_support/testing/autorun"
|
||||||
|
require "active_support/testing/method_call_assertions"
|
||||||
require "action_mailer"
|
require "action_mailer"
|
||||||
require "action_mailer/test_case"
|
require "action_mailer/test_case"
|
||||||
|
|
||||||
|
@ -35,6 +36,8 @@ ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH
|
||||||
ActionMailer::Base.delivery_job = ActionMailer::MailDeliveryJob
|
ActionMailer::Base.delivery_job = ActionMailer::MailDeliveryJob
|
||||||
|
|
||||||
class ActiveSupport::TestCase
|
class ActiveSupport::TestCase
|
||||||
|
include ActiveSupport::Testing::MethodCallAssertions
|
||||||
|
|
||||||
private
|
private
|
||||||
# Skips the current run on Rubinius using Minitest::Assertions#skip
|
# Skips the current run on Rubinius using Minitest::Assertions#skip
|
||||||
def rubinius_skip(message = "")
|
def rubinius_skip(message = "")
|
||||||
|
|
|
@ -350,7 +350,11 @@ class CommentsController < ResourcesController; end
|
||||||
class AccountsController < ResourcesController; end
|
class AccountsController < ResourcesController; end
|
||||||
class ImagesController < ResourcesController; end
|
class ImagesController < ResourcesController; end
|
||||||
|
|
||||||
|
require "active_support/testing/method_call_assertions"
|
||||||
|
|
||||||
class ActiveSupport::TestCase
|
class ActiveSupport::TestCase
|
||||||
|
include ActiveSupport::Testing::MethodCallAssertions
|
||||||
|
|
||||||
private
|
private
|
||||||
# Skips the current run on Rubinius using Minitest::Assertions#skip
|
# Skips the current run on Rubinius using Minitest::Assertions#skip
|
||||||
def rubinius_skip(message = "")
|
def rubinius_skip(message = "")
|
||||||
|
|
|
@ -16,6 +16,7 @@ silence_warnings do
|
||||||
end
|
end
|
||||||
|
|
||||||
require "active_support/testing/autorun"
|
require "active_support/testing/autorun"
|
||||||
|
require "active_support/testing/method_call_assertions"
|
||||||
require "action_controller"
|
require "action_controller"
|
||||||
require "action_view"
|
require "action_view"
|
||||||
require "action_view/testing/resolvers"
|
require "action_view/testing/resolvers"
|
||||||
|
@ -193,6 +194,8 @@ end
|
||||||
class ActiveSupport::TestCase
|
class ActiveSupport::TestCase
|
||||||
parallelize
|
parallelize
|
||||||
|
|
||||||
|
include ActiveSupport::Testing::MethodCallAssertions
|
||||||
|
|
||||||
private
|
private
|
||||||
# Skips the current run on Rubinius using Minitest::Assertions#skip
|
# Skips the current run on Rubinius using Minitest::Assertions#skip
|
||||||
def rubinius_skip(message = "")
|
def rubinius_skip(message = "")
|
||||||
|
|
|
@ -9,9 +9,12 @@ ActiveSupport::Deprecation.debug = true
|
||||||
I18n.enforce_available_locales = false
|
I18n.enforce_available_locales = false
|
||||||
|
|
||||||
require "active_support/testing/autorun"
|
require "active_support/testing/autorun"
|
||||||
|
require "active_support/testing/method_call_assertions"
|
||||||
require "active_support/core_ext/integer/time"
|
require "active_support/core_ext/integer/time"
|
||||||
|
|
||||||
class ActiveModel::TestCase < ActiveSupport::TestCase
|
class ActiveModel::TestCase < ActiveSupport::TestCase
|
||||||
|
include ActiveSupport::Testing::MethodCallAssertions
|
||||||
|
|
||||||
private
|
private
|
||||||
# Skips the current run on Rubinius using Minitest::Assertions#skip
|
# Skips the current run on Rubinius using Minitest::Assertions#skip
|
||||||
def rubinius_skip(message = "")
|
def rubinius_skip(message = "")
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
require "active_support"
|
require "active_support"
|
||||||
require "active_support/testing/autorun"
|
require "active_support/testing/autorun"
|
||||||
|
require "active_support/testing/method_call_assertions"
|
||||||
require "active_support/testing/stream"
|
require "active_support/testing/stream"
|
||||||
require "active_record/fixtures"
|
require "active_record/fixtures"
|
||||||
|
|
||||||
|
@ -12,6 +13,7 @@ module ActiveRecord
|
||||||
#
|
#
|
||||||
# Defines some test assertions to test against SQL queries.
|
# Defines some test assertions to test against SQL queries.
|
||||||
class TestCase < ActiveSupport::TestCase #:nodoc:
|
class TestCase < ActiveSupport::TestCase #:nodoc:
|
||||||
|
include ActiveSupport::Testing::MethodCallAssertions
|
||||||
include ActiveSupport::Testing::Stream
|
include ActiveSupport::Testing::Stream
|
||||||
include ActiveRecord::TestFixtures
|
include ActiveRecord::TestFixtures
|
||||||
include ActiveRecord::ValidationsRepairHelper
|
include ActiveRecord::ValidationsRepairHelper
|
||||||
|
|
|
@ -2,8 +2,11 @@
|
||||||
|
|
||||||
require "test_helper"
|
require "test_helper"
|
||||||
require "database/setup"
|
require "database/setup"
|
||||||
|
require "active_support/testing/method_call_assertions"
|
||||||
|
|
||||||
class ActiveStorage::BlobTest < ActiveSupport::TestCase
|
class ActiveStorage::BlobTest < ActiveSupport::TestCase
|
||||||
|
include ActiveSupport::Testing::MethodCallAssertions
|
||||||
|
|
||||||
test "unattached scope" do
|
test "unattached scope" do
|
||||||
[ create_blob(filename: "funky.jpg"), create_blob(filename: "town.jpg") ].tap do |blobs|
|
[ create_blob(filename: "funky.jpg"), create_blob(filename: "town.jpg") ].tap do |blobs|
|
||||||
User.create! name: "DHH", avatar: blobs.first
|
User.create! name: "DHH", avatar: blobs.first
|
||||||
|
|
|
@ -5,7 +5,6 @@ require "minitest"
|
||||||
require "active_support/testing/tagged_logging"
|
require "active_support/testing/tagged_logging"
|
||||||
require "active_support/testing/setup_and_teardown"
|
require "active_support/testing/setup_and_teardown"
|
||||||
require "active_support/testing/assertions"
|
require "active_support/testing/assertions"
|
||||||
require "active_support/testing/method_call_assertions"
|
|
||||||
require "active_support/testing/deprecation"
|
require "active_support/testing/deprecation"
|
||||||
require "active_support/testing/declarative"
|
require "active_support/testing/declarative"
|
||||||
require "active_support/testing/isolation"
|
require "active_support/testing/isolation"
|
||||||
|
@ -138,13 +137,11 @@ module ActiveSupport
|
||||||
include ActiveSupport::Testing::TaggedLogging
|
include ActiveSupport::Testing::TaggedLogging
|
||||||
prepend ActiveSupport::Testing::SetupAndTeardown
|
prepend ActiveSupport::Testing::SetupAndTeardown
|
||||||
include ActiveSupport::Testing::Assertions
|
include ActiveSupport::Testing::Assertions
|
||||||
include ActiveSupport::Testing::MethodCallAssertions
|
|
||||||
include ActiveSupport::Testing::Deprecation
|
include ActiveSupport::Testing::Deprecation
|
||||||
include ActiveSupport::Testing::TimeHelpers
|
include ActiveSupport::Testing::TimeHelpers
|
||||||
include ActiveSupport::Testing::FileFixtures
|
include ActiveSupport::Testing::FileFixtures
|
||||||
extend ActiveSupport::Testing::Declarative
|
extend ActiveSupport::Testing::Declarative
|
||||||
|
|
||||||
|
|
||||||
# test/unit backwards compatibility methods
|
# test/unit backwards compatibility methods
|
||||||
alias :assert_raise :assert_raises
|
alias :assert_raise :assert_raises
|
||||||
alias :assert_not_empty :refute_empty
|
alias :assert_not_empty :refute_empty
|
||||||
|
|
|
@ -10,6 +10,7 @@ silence_warnings do
|
||||||
end
|
end
|
||||||
|
|
||||||
require "active_support/testing/autorun"
|
require "active_support/testing/autorun"
|
||||||
|
require "active_support/testing/method_call_assertions"
|
||||||
|
|
||||||
ENV["NO_RELOAD"] = "1"
|
ENV["NO_RELOAD"] = "1"
|
||||||
require "active_support"
|
require "active_support"
|
||||||
|
@ -26,6 +27,8 @@ ActiveSupport.to_time_preserves_timezone = ENV["PRESERVE_TIMEZONES"] == "1"
|
||||||
I18n.enforce_available_locales = false
|
I18n.enforce_available_locales = false
|
||||||
|
|
||||||
class ActiveSupport::TestCase
|
class ActiveSupport::TestCase
|
||||||
|
include ActiveSupport::Testing::MethodCallAssertions
|
||||||
|
|
||||||
private
|
private
|
||||||
# Skips the current run on Rubinius using Minitest::Assertions#skip
|
# Skips the current run on Rubinius using Minitest::Assertions#skip
|
||||||
def rubinius_skip(message = "")
|
def rubinius_skip(message = "")
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
require "abstract_unit"
|
require "abstract_unit"
|
||||||
require "active_support/core_ext/module/remove_method"
|
require "active_support/core_ext/module/remove_method"
|
||||||
require "active_support/testing/stream"
|
require "active_support/testing/stream"
|
||||||
|
require "active_support/testing/method_call_assertions"
|
||||||
require "rails/generators"
|
require "rails/generators"
|
||||||
require "rails/generators/test_case"
|
require "rails/generators/test_case"
|
||||||
|
|
||||||
|
@ -27,6 +28,7 @@ require "action_view"
|
||||||
|
|
||||||
module GeneratorsTestHelper
|
module GeneratorsTestHelper
|
||||||
include ActiveSupport::Testing::Stream
|
include ActiveSupport::Testing::Stream
|
||||||
|
include ActiveSupport::Testing::MethodCallAssertions
|
||||||
|
|
||||||
GemfileEntry = Struct.new(:name, :version, :comment, :options, :commented_out) do
|
GemfileEntry = Struct.new(:name, :version, :comment, :options, :commented_out) do
|
||||||
def initialize(name, version, comment, options = {}, commented_out = false)
|
def initialize(name, version, comment, options = {}, commented_out = false)
|
||||||
|
|
|
@ -14,6 +14,7 @@ require "bundler/setup" unless defined?(Bundler)
|
||||||
require "active_support"
|
require "active_support"
|
||||||
require "active_support/testing/autorun"
|
require "active_support/testing/autorun"
|
||||||
require "active_support/testing/stream"
|
require "active_support/testing/stream"
|
||||||
|
require "active_support/testing/method_call_assertions"
|
||||||
require "active_support/test_case"
|
require "active_support/test_case"
|
||||||
require "minitest/retry"
|
require "minitest/retry"
|
||||||
|
|
||||||
|
@ -494,6 +495,7 @@ class ActiveSupport::TestCase
|
||||||
include TestHelpers::Generation
|
include TestHelpers::Generation
|
||||||
include TestHelpers::Reload
|
include TestHelpers::Reload
|
||||||
include ActiveSupport::Testing::Stream
|
include ActiveSupport::Testing::Stream
|
||||||
|
include ActiveSupport::Testing::MethodCallAssertions
|
||||||
end
|
end
|
||||||
|
|
||||||
# Create a scope and build a fixture rails app
|
# Create a scope and build a fixture rails app
|
||||||
|
|
Loading…
Reference in New Issue