From 01eddb390c4016f7af61979519911ed442aa7a06 Mon Sep 17 00:00:00 2001 From: Edouard CHIN Date: Fri, 6 Apr 2018 12:17:58 -0400 Subject: [PATCH] Rename the class as there is already an existing class with that name --- .../{setup_and_teardown_test.rb => after_teardown_test.rb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename activesupport/test/testing/{setup_and_teardown_test.rb => after_teardown_test.rb} (93%) diff --git a/activesupport/test/testing/setup_and_teardown_test.rb b/activesupport/test/testing/after_teardown_test.rb similarity index 93% rename from activesupport/test/testing/setup_and_teardown_test.rb rename to activesupport/test/testing/after_teardown_test.rb index 283f82d19a..68c368909c 100644 --- a/activesupport/test/testing/setup_and_teardown_test.rb +++ b/activesupport/test/testing/after_teardown_test.rb @@ -8,7 +8,7 @@ module OtherAfterTeardown end end -class SetupAndTeardownTest < Minitest::Test +class AfterTeardownTest < Minitest::Test include OtherAfterTeardown include ActiveSupport::Testing::SetupAndTeardown