diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-08-21 12:58:25 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-08-21 12:58:25 -0700 |
| commit | 6bef1469d2e43d0815b70588370470983a4320af (patch) | |
| tree | 7d1f2f5cc9506507e02cc13d2b6ff7f614a8ca88 /activesupport/test | |
| parent | 11e890fef8982caa206e4fbc033f896e6ad424a1 (diff) | |
| parent | da3d28ea33a7e418c99e89aa6b4028ba054f1f39 (diff) | |
| download | rails-6bef1469d2e43d0815b70588370470983a4320af.tar.gz rails-6bef1469d2e43d0815b70588370470983a4320af.tar.bz2 rails-6bef1469d2e43d0815b70588370470983a4320af.zip | |
Merge pull request #7225 from rails/eager_load
Improve eager load on Rails
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/autoload_test.rb (renamed from activesupport/test/autoload.rb) | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/activesupport/test/autoload.rb b/activesupport/test/autoload_test.rb index 5d8026a9ca..7d02d835a8 100644 --- a/activesupport/test/autoload.rb +++ b/activesupport/test/autoload_test.rb @@ -28,15 +28,6 @@ class TestAutoloadModule < ActiveSupport::TestCase assert_nothing_raised { ::Fixtures::Autoload::SomeClass } end - test ":eager constants can be triggered via ActiveSupport::Autoload.eager_autoload!" do - module ::Fixtures::Autoload - autoload :SomeClass, "fixtures/autoload/some_class" - end - ActiveSupport::Autoload.eager_autoload! - assert $LOADED_FEATURES.include?("fixtures/autoload/some_class.rb") - assert_nothing_raised { ::Fixtures::Autoload::SomeClass } - end - test "the location of autoloaded constants defaults to :name.underscore" do module ::Fixtures::Autoload autoload :SomeClass @@ -51,8 +42,7 @@ class TestAutoloadModule < ActiveSupport::TestCase autoload :SomeClass end - ActiveSupport::Autoload.eager_autoload! - assert $LOADED_FEATURES.include?("fixtures/autoload/some_class.rb") + ::Fixtures::Autoload.eager_load! assert_nothing_raised { ::Fixtures::Autoload::SomeClass } end |