aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/testing
diff options
context:
space:
mode:
authorEdouard CHIN <edouard.chin@shopify.com>2018-04-06 12:17:58 -0400
committerEdouard CHIN <edouard.chin@shopify.com>2018-04-06 12:17:58 -0400
commit01eddb390c4016f7af61979519911ed442aa7a06 (patch)
tree33cb4ae3b9a8724f37b8526536b93ba6d1fe43d2 /activesupport/test/testing
parent70fae9a434d64238663fea3d4c6abdc86206a0f2 (diff)
downloadrails-01eddb390c4016f7af61979519911ed442aa7a06.tar.gz
rails-01eddb390c4016f7af61979519911ed442aa7a06.tar.bz2
rails-01eddb390c4016f7af61979519911ed442aa7a06.zip
Rename the class as there is already an existing class with that name
Diffstat (limited to 'activesupport/test/testing')
-rw-r--r--activesupport/test/testing/after_teardown_test.rb (renamed from activesupport/test/testing/setup_and_teardown_test.rb)2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/testing/setup_and_teardown_test.rb b/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