diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-18 16:05:30 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-18 16:05:30 -0300 |
| commit | 7f96e4317e1354852e9600becb16662de3c17691 (patch) | |
| tree | 67da6d24347e0d46aab3b425ed44c6060e93854e /railties/test | |
| parent | e4003adff93a1379a5e632f7e199c61bf34c293d (diff) | |
| download | rails-7f96e4317e1354852e9600becb16662de3c17691.tar.gz rails-7f96e4317e1354852e9600becb16662de3c17691.tar.bz2 rails-7f96e4317e1354852e9600becb16662de3c17691.zip | |
Revert "Merge pull request #7587 from elia/fix-too-eager-loading"
This reverts commit 3663057518eb9acf9b1e72f47dcb07038e6b7368.
REASON: This caused a regression that add app folder in the eager load
path. See #8146 for more information.
Conflicts:
railties/CHANGELOG.md
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/application/paths_test.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/railties/test/application/paths_test.rb b/railties/test/application/paths_test.rb index 2265d220ab..f462ba1e05 100644 --- a/railties/test/application/paths_test.rb +++ b/railties/test/application/paths_test.rb @@ -59,8 +59,6 @@ module ApplicationTests assert eager_load.include?(root("app/controllers")) assert eager_load.include?(root("app/helpers")) assert eager_load.include?(root("app/models")) - assert !eager_load.include?(root("app/views")), "expected to not be in the eager_load_path" - assert !eager_load.include?(root("app/assets")), "expected to not be in the eager_load_path" end test "environments has a glob equal to the current environment" do @@ -75,7 +73,6 @@ module ApplicationTests assert_in_load_path "vendor" assert_not_in_load_path "app", "views" - assert_not_in_load_path "app", "assets" assert_not_in_load_path "config" assert_not_in_load_path "config", "locales" assert_not_in_load_path "config", "environments" |