From 27624077e60dff45130843fd64562dfbea528690 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Tue, 6 Apr 2021 19:50:56 +0200 Subject: [PATCH] Delete orphan autoloading fixtures Rails now delegates autoloading to Zeitwerk, and therefore does not need to test autoloading itself. Zeitwerk has test coverage, in Rails we only need to test the integration. We are gradually trimming AS::Dependencies, and the AS test suite. With the removal of DependenciesTestHelpers and client code in af27a25, these fixtures became orphan. Three of them are left. They are to be autoloaded with Module#autoload because they raise errors when the file is evaluated. Their current use cases are already committed. --- activesupport/test/autoloading_fixtures/a/b.rb | 4 ---- activesupport/test/autoloading_fixtures/a/c/d.rb | 4 ---- activesupport/test/autoloading_fixtures/a/c/em/f.rb | 4 ---- activesupport/test/autoloading_fixtures/application.rb | 3 --- activesupport/test/autoloading_fixtures/circular1.rb | 8 -------- activesupport/test/autoloading_fixtures/circular2.rb | 6 ------ .../test/autoloading_fixtures/class_folder.rb | 5 ----- .../class_folder/class_folder_subclass.rb | 5 ----- .../autoloading_fixtures/class_folder/inline_class.rb | 4 ---- .../autoloading_fixtures/class_folder/nested_class.rb | 9 --------- activesupport/test/autoloading_fixtures/conflict.rb | 3 --- .../test/autoloading_fixtures/counting_loader.rb | 7 ------- .../test/autoloading_fixtures/cross_site_dependency.rb | 4 ---- activesupport/test/autoloading_fixtures/d.rb | 4 ---- activesupport/test/autoloading_fixtures/em.rb | 4 ---- .../test/autoloading_fixtures/html/some_class.rb | 6 ------ .../autoloading_fixtures/load_path/loaded_constant.rb | 4 ---- .../test/autoloading_fixtures/loads_constant.rb | 7 ------- .../autoloading_fixtures/module_folder/inline_class.rb | 4 ---- .../autoloading_fixtures/module_folder/nested_class.rb | 6 ------ .../module_folder/nested_sibling.rb | 4 ---- .../module_folder/nested_with_require.rb | 8 -------- .../module_with_custom_const_missing/a/b.rb | 3 --- .../autoloading_fixtures/multiple_constant_file.rb | 4 ---- .../autoloading_fixtures/nested_with_require_parent.rb | 5 ----- activesupport/test/autoloading_fixtures/prepend.rb | 10 ---------- .../autoloading_fixtures/prepend/sub_class_conflict.rb | 4 ---- .../autoloading_fixtures/raises_arbitrary_exception.rb | 6 ------ .../test/autoloading_fixtures/requires_constant.rb | 6 ------ .../autoloading_fixtures/should_not_be_required.rb | 3 --- activesupport/test/autoloading_fixtures/throws.rb | 6 ------ activesupport/test/autoloading_fixtures/typo.rb | 3 --- 32 files changed, 163 deletions(-) delete mode 100644 activesupport/test/autoloading_fixtures/a/b.rb delete mode 100644 activesupport/test/autoloading_fixtures/a/c/d.rb delete mode 100644 activesupport/test/autoloading_fixtures/a/c/em/f.rb delete mode 100644 activesupport/test/autoloading_fixtures/application.rb delete mode 100644 activesupport/test/autoloading_fixtures/circular1.rb delete mode 100644 activesupport/test/autoloading_fixtures/circular2.rb delete mode 100644 activesupport/test/autoloading_fixtures/class_folder.rb delete mode 100644 activesupport/test/autoloading_fixtures/class_folder/class_folder_subclass.rb delete mode 100644 activesupport/test/autoloading_fixtures/class_folder/inline_class.rb delete mode 100644 activesupport/test/autoloading_fixtures/class_folder/nested_class.rb delete mode 100644 activesupport/test/autoloading_fixtures/conflict.rb delete mode 100644 activesupport/test/autoloading_fixtures/counting_loader.rb delete mode 100644 activesupport/test/autoloading_fixtures/cross_site_dependency.rb delete mode 100644 activesupport/test/autoloading_fixtures/d.rb delete mode 100644 activesupport/test/autoloading_fixtures/em.rb delete mode 100644 activesupport/test/autoloading_fixtures/html/some_class.rb delete mode 100644 activesupport/test/autoloading_fixtures/load_path/loaded_constant.rb delete mode 100644 activesupport/test/autoloading_fixtures/loads_constant.rb delete mode 100644 activesupport/test/autoloading_fixtures/module_folder/inline_class.rb delete mode 100644 activesupport/test/autoloading_fixtures/module_folder/nested_class.rb delete mode 100644 activesupport/test/autoloading_fixtures/module_folder/nested_sibling.rb delete mode 100644 activesupport/test/autoloading_fixtures/module_folder/nested_with_require.rb delete mode 100644 activesupport/test/autoloading_fixtures/module_with_custom_const_missing/a/b.rb delete mode 100644 activesupport/test/autoloading_fixtures/multiple_constant_file.rb delete mode 100644 activesupport/test/autoloading_fixtures/nested_with_require_parent.rb delete mode 100644 activesupport/test/autoloading_fixtures/prepend.rb delete mode 100644 activesupport/test/autoloading_fixtures/prepend/sub_class_conflict.rb delete mode 100644 activesupport/test/autoloading_fixtures/raises_arbitrary_exception.rb delete mode 100644 activesupport/test/autoloading_fixtures/requires_constant.rb delete mode 100644 activesupport/test/autoloading_fixtures/should_not_be_required.rb delete mode 100644 activesupport/test/autoloading_fixtures/throws.rb delete mode 100644 activesupport/test/autoloading_fixtures/typo.rb diff --git a/activesupport/test/autoloading_fixtures/a/b.rb b/activesupport/test/autoloading_fixtures/a/b.rb deleted file mode 100644 index 27baaea08c..0000000000 --- a/activesupport/test/autoloading_fixtures/a/b.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -class A::B -end diff --git a/activesupport/test/autoloading_fixtures/a/c/d.rb b/activesupport/test/autoloading_fixtures/a/c/d.rb deleted file mode 100644 index f07128673f..0000000000 --- a/activesupport/test/autoloading_fixtures/a/c/d.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -class A::C::D -end diff --git a/activesupport/test/autoloading_fixtures/a/c/em/f.rb b/activesupport/test/autoloading_fixtures/a/c/em/f.rb deleted file mode 100644 index 78c96cf45f..0000000000 --- a/activesupport/test/autoloading_fixtures/a/c/em/f.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -class A::C::EM::F -end diff --git a/activesupport/test/autoloading_fixtures/application.rb b/activesupport/test/autoloading_fixtures/application.rb deleted file mode 100644 index 971cbe1b17..0000000000 --- a/activesupport/test/autoloading_fixtures/application.rb +++ /dev/null @@ -1,3 +0,0 @@ -# frozen_string_literal: true - -ApplicationController = 10 diff --git a/activesupport/test/autoloading_fixtures/circular1.rb b/activesupport/test/autoloading_fixtures/circular1.rb deleted file mode 100644 index 7f891b5eb1..0000000000 --- a/activesupport/test/autoloading_fixtures/circular1.rb +++ /dev/null @@ -1,8 +0,0 @@ -# frozen_string_literal: true - -silence_warnings do - Circular2 -end - -class Circular1 -end diff --git a/activesupport/test/autoloading_fixtures/circular2.rb b/activesupport/test/autoloading_fixtures/circular2.rb deleted file mode 100644 index 1fdb4c261f..0000000000 --- a/activesupport/test/autoloading_fixtures/circular2.rb +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -Circular1 - -class Circular2 -end diff --git a/activesupport/test/autoloading_fixtures/class_folder.rb b/activesupport/test/autoloading_fixtures/class_folder.rb deleted file mode 100644 index ff0826c298..0000000000 --- a/activesupport/test/autoloading_fixtures/class_folder.rb +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -class ClassFolder - ConstantInClassFolder = "indeed" -end diff --git a/activesupport/test/autoloading_fixtures/class_folder/class_folder_subclass.rb b/activesupport/test/autoloading_fixtures/class_folder/class_folder_subclass.rb deleted file mode 100644 index cd901e9d71..0000000000 --- a/activesupport/test/autoloading_fixtures/class_folder/class_folder_subclass.rb +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -class ClassFolder::ClassFolderSubclass < ClassFolder - ConstantInClassFolder = "indeed" -end diff --git a/activesupport/test/autoloading_fixtures/class_folder/inline_class.rb b/activesupport/test/autoloading_fixtures/class_folder/inline_class.rb deleted file mode 100644 index 960bfcbc70..0000000000 --- a/activesupport/test/autoloading_fixtures/class_folder/inline_class.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -class ClassFolder::InlineClass -end diff --git a/activesupport/test/autoloading_fixtures/class_folder/nested_class.rb b/activesupport/test/autoloading_fixtures/class_folder/nested_class.rb deleted file mode 100644 index 98426b797d..0000000000 --- a/activesupport/test/autoloading_fixtures/class_folder/nested_class.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -class ClassFolder - class NestedClass - end - - class SiblingClass - end -end diff --git a/activesupport/test/autoloading_fixtures/conflict.rb b/activesupport/test/autoloading_fixtures/conflict.rb deleted file mode 100644 index c5d3f6bdc0..0000000000 --- a/activesupport/test/autoloading_fixtures/conflict.rb +++ /dev/null @@ -1,3 +0,0 @@ -# frozen_string_literal: true - -Conflict = 2 diff --git a/activesupport/test/autoloading_fixtures/counting_loader.rb b/activesupport/test/autoloading_fixtures/counting_loader.rb deleted file mode 100644 index 6ac3a9828d..0000000000 --- a/activesupport/test/autoloading_fixtures/counting_loader.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -$counting_loaded_times ||= 0 -$counting_loaded_times += 1 - -module CountingLoader -end diff --git a/activesupport/test/autoloading_fixtures/cross_site_dependency.rb b/activesupport/test/autoloading_fixtures/cross_site_dependency.rb deleted file mode 100644 index 8a18dcff10..0000000000 --- a/activesupport/test/autoloading_fixtures/cross_site_dependency.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -class CrossSiteDependency -end diff --git a/activesupport/test/autoloading_fixtures/d.rb b/activesupport/test/autoloading_fixtures/d.rb deleted file mode 100644 index 72752d878e..0000000000 --- a/activesupport/test/autoloading_fixtures/d.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -class D -end diff --git a/activesupport/test/autoloading_fixtures/em.rb b/activesupport/test/autoloading_fixtures/em.rb deleted file mode 100644 index 2e0ac9a6f9..0000000000 --- a/activesupport/test/autoloading_fixtures/em.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -class EM -end diff --git a/activesupport/test/autoloading_fixtures/html/some_class.rb b/activesupport/test/autoloading_fixtures/html/some_class.rb deleted file mode 100644 index fbbfd4a214..0000000000 --- a/activesupport/test/autoloading_fixtures/html/some_class.rb +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -module HTML - class SomeClass - end -end diff --git a/activesupport/test/autoloading_fixtures/load_path/loaded_constant.rb b/activesupport/test/autoloading_fixtures/load_path/loaded_constant.rb deleted file mode 100644 index 8735ce87e1..0000000000 --- a/activesupport/test/autoloading_fixtures/load_path/loaded_constant.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -module LoadedConstant -end diff --git a/activesupport/test/autoloading_fixtures/loads_constant.rb b/activesupport/test/autoloading_fixtures/loads_constant.rb deleted file mode 100644 index 0bb434a956..0000000000 --- a/activesupport/test/autoloading_fixtures/loads_constant.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -module LoadsConstant -end - -# The _ = assignment is to prevent warnings -_ = RequiresConstant diff --git a/activesupport/test/autoloading_fixtures/module_folder/inline_class.rb b/activesupport/test/autoloading_fixtures/module_folder/inline_class.rb deleted file mode 100644 index c11246b528..0000000000 --- a/activesupport/test/autoloading_fixtures/module_folder/inline_class.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -class ModuleFolder::InlineClass -end diff --git a/activesupport/test/autoloading_fixtures/module_folder/nested_class.rb b/activesupport/test/autoloading_fixtures/module_folder/nested_class.rb deleted file mode 100644 index 69226b405c..0000000000 --- a/activesupport/test/autoloading_fixtures/module_folder/nested_class.rb +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -module ModuleFolder - class NestedClass - end -end diff --git a/activesupport/test/autoloading_fixtures/module_folder/nested_sibling.rb b/activesupport/test/autoloading_fixtures/module_folder/nested_sibling.rb deleted file mode 100644 index 30de83af11..0000000000 --- a/activesupport/test/autoloading_fixtures/module_folder/nested_sibling.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -class ModuleFolder::NestedSibling -end diff --git a/activesupport/test/autoloading_fixtures/module_folder/nested_with_require.rb b/activesupport/test/autoloading_fixtures/module_folder/nested_with_require.rb deleted file mode 100644 index f9d6e675d7..0000000000 --- a/activesupport/test/autoloading_fixtures/module_folder/nested_with_require.rb +++ /dev/null @@ -1,8 +0,0 @@ -# frozen_string_literal: true - -require "dependencies/module_folder/lib_class" - -module ModuleFolder - class NestedWithRequire - end -end diff --git a/activesupport/test/autoloading_fixtures/module_with_custom_const_missing/a/b.rb b/activesupport/test/autoloading_fixtures/module_with_custom_const_missing/a/b.rb deleted file mode 100644 index f688c1ef35..0000000000 --- a/activesupport/test/autoloading_fixtures/module_with_custom_const_missing/a/b.rb +++ /dev/null @@ -1,3 +0,0 @@ -# frozen_string_literal: true - -ModuleWithCustomConstMissing::A::B = "10" diff --git a/activesupport/test/autoloading_fixtures/multiple_constant_file.rb b/activesupport/test/autoloading_fixtures/multiple_constant_file.rb deleted file mode 100644 index 1da26e6c2c..0000000000 --- a/activesupport/test/autoloading_fixtures/multiple_constant_file.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -MultipleConstantFile = 10 -SiblingConstant = MultipleConstantFile * 2 diff --git a/activesupport/test/autoloading_fixtures/nested_with_require_parent.rb b/activesupport/test/autoloading_fixtures/nested_with_require_parent.rb deleted file mode 100644 index e8fb321077..0000000000 --- a/activesupport/test/autoloading_fixtures/nested_with_require_parent.rb +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -class NestedWithRequireParent - ModuleFolder::NestedWithRequire -end diff --git a/activesupport/test/autoloading_fixtures/prepend.rb b/activesupport/test/autoloading_fixtures/prepend.rb deleted file mode 100644 index bf9e36e12c..0000000000 --- a/activesupport/test/autoloading_fixtures/prepend.rb +++ /dev/null @@ -1,10 +0,0 @@ -# frozen_string_literal: true - -class SubClassConflict -end - -class Prepend - module PrependedModule - end - prepend PrependedModule -end diff --git a/activesupport/test/autoloading_fixtures/prepend/sub_class_conflict.rb b/activesupport/test/autoloading_fixtures/prepend/sub_class_conflict.rb deleted file mode 100644 index 506c3c5920..0000000000 --- a/activesupport/test/autoloading_fixtures/prepend/sub_class_conflict.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -class Prepend::SubClassConflict -end diff --git a/activesupport/test/autoloading_fixtures/raises_arbitrary_exception.rb b/activesupport/test/autoloading_fixtures/raises_arbitrary_exception.rb deleted file mode 100644 index 118ee6bdd1..0000000000 --- a/activesupport/test/autoloading_fixtures/raises_arbitrary_exception.rb +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -RaisesArbitraryException = 1 -_ = A::B # Autoloading recursion, also expected to be watched and discarded. - -raise Exception, "arbitrary exception message" diff --git a/activesupport/test/autoloading_fixtures/requires_constant.rb b/activesupport/test/autoloading_fixtures/requires_constant.rb deleted file mode 100644 index 6e51998949..0000000000 --- a/activesupport/test/autoloading_fixtures/requires_constant.rb +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -require "loaded_constant" - -module RequiresConstant -end diff --git a/activesupport/test/autoloading_fixtures/should_not_be_required.rb b/activesupport/test/autoloading_fixtures/should_not_be_required.rb deleted file mode 100644 index 8deffa1816..0000000000 --- a/activesupport/test/autoloading_fixtures/should_not_be_required.rb +++ /dev/null @@ -1,3 +0,0 @@ -# frozen_string_literal: true - -ShouldNotBeAutoloaded = 0 diff --git a/activesupport/test/autoloading_fixtures/throws.rb b/activesupport/test/autoloading_fixtures/throws.rb deleted file mode 100644 index b6fb391032..0000000000 --- a/activesupport/test/autoloading_fixtures/throws.rb +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -Throws = 1 -_ = A::B # Autoloading recursion, expected to be discarded. - -throw :t diff --git a/activesupport/test/autoloading_fixtures/typo.rb b/activesupport/test/autoloading_fixtures/typo.rb deleted file mode 100644 index d45cddbcf5..0000000000 --- a/activesupport/test/autoloading_fixtures/typo.rb +++ /dev/null @@ -1,3 +0,0 @@ -# frozen_string_literal: true - -TypO = 1