Changeset 4979
- Timestamp:
- 09/04/06 06:02:16 (2 years ago)
- Files:
-
- trunk/activesupport/test/reloadable_test.rb (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/activesupport/test/reloadable_test.rb
r4728 r4979 1 1 require File.dirname(__FILE__) + '/abstract_unit' 2 2 3 module ReloadableTestSandbox 3 ActiveSupport::Deprecation.silence do 4 module ReloadableTestSandbox 5 class AReloadableClass 6 include Reloadable 7 end 8 class AReloadableClassWithSubclasses 9 include Reloadable 10 end 11 class AReloadableSubclass < AReloadableClassWithSubclasses 12 end 13 class ANonReloadableSubclass < AReloadableClassWithSubclasses 14 def self.reloadable? 15 false 16 end 17 end 18 class AClassWhichDefinesItsOwnReloadable 19 def self.reloadable? 20 10 21 end 22 include Reloadable 23 end 4 24 5 class AReloadableClass 6 include Reloadable 7 end 8 class AReloadableClassWithSubclasses 9 include Reloadable 10 end 11 class AReloadableSubclass < AReloadableClassWithSubclasses 12 end 13 class ANonReloadableSubclass < AReloadableClassWithSubclasses 14 def self.reloadable? 15 false 25 class SubclassesReloadable 26 include Reloadable::Subclasses 16 27 end 17 end 18 class AClassWhichDefinesItsOwnReloadable 19 def self.reloadable? 20 10 28 class ASubclassOfSubclassesReloadable < SubclassesReloadable 21 29 end 22 include Reloadable23 end24 30 25 class SubclassesReloadable 26 include Reloadable::Subclasses 27 end 28 class ASubclassOfSubclassesReloadable < SubclassesReloadable 29 end 31 class AnOnlySubclassReloadableClassSubclassingAReloadableClass 32 include Reloadable::Subclasses 33 end 30 34 31 class AnOnlySubclassReloadableClassSubclassingAReloadableClass 32 include Reloadable::Subclasses 33 end 34 35 class ASubclassofAOnlySubclassReloadableClassWhichWasSubclassingAReloadableClass < AnOnlySubclassReloadableClassSubclassingAReloadableClass 35 class ASubclassofAOnlySubclassReloadableClassWhichWasSubclassingAReloadableClass < AnOnlySubclassReloadableClassSubclassingAReloadableClass 36 end 36 37 end 37 38 end … … 49 50 50 51 def test_only_subclass_reloadable 51 assert ! ReloadableTestSandbox::SubclassesReloadable.reloadable? 52 assert ReloadableTestSandbox::ASubclassOfSubclassesReloadable.reloadable? 52 assert_deprecated_reloadable do 53 assert !ReloadableTestSandbox::SubclassesReloadable.reloadable? 54 assert ReloadableTestSandbox::ASubclassOfSubclassesReloadable.reloadable? 55 end 53 56 end 54 57 55 58 def test_inside_hierarchy_only_subclass_reloadable 56 assert ! ReloadableTestSandbox::AnOnlySubclassReloadableClassSubclassingAReloadableClass.reloadable? 57 assert ReloadableTestSandbox::ASubclassofAOnlySubclassReloadableClassWhichWasSubclassingAReloadableClass.reloadable? 59 assert_deprecated_reloadable do 60 assert !ReloadableTestSandbox::AnOnlySubclassReloadableClassSubclassingAReloadableClass.reloadable? 61 assert ReloadableTestSandbox::ASubclassofAOnlySubclassReloadableClassWhichWasSubclassingAReloadableClass.reloadable? 62 end 58 63 end 59 64 … … 71 76 ) 72 77 73 results = Reloadable.reloadable_classes 78 results = [] 79 assert_deprecated_reloadable { results = Reloadable.reloadable_classes } 74 80 reloadables.each do |name| 75 81 assert results.include?(ReloadableTestSandbox.const_get(name)), "Expected #{name} to be reloadable" … … 82 88 def test_including_reloadable_should_warn 83 89 c = Class.new 84 assert_deprecated %r{Reloadable}do90 assert_deprecated_reloadable do 85 91 c.send :include, Reloadable 86 92 end 87 93 88 assert_deprecated { c.reloadable? }94 assert_deprecated_reloadable { c.reloadable? } 89 95 end 90 96 … … 97 103 assert_match %r{Reloadable::Subclasses}, deps.first 98 104 99 assert_deprecated { c.reloadable? }105 assert_deprecated_reloadable { c.reloadable? } 100 106 end 101 107 … … 108 114 109 115 assert c.respond_to?(:reloadable?) 110 assert_deprecated { c.reloadable? }116 assert_deprecated_reloadable { c.reloadable? } 111 117 end 112 118 119 protected 120 def assert_deprecated_reloadable(&block) 121 assert_deprecated(/reloadable/, &block) 122 end 113 123 end
