diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-29 06:02:16 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-29 11:14:14 -0200 |
| commit | 3663057518eb9acf9b1e72f47dcb07038e6b7368 (patch) | |
| tree | 6747ac3e35ef28530b7ff83b27a272607a724ac1 /railties/test | |
| parent | 71abfa511da77109b2bbf913dcee2f9e1606e66a (diff) | |
| download | rails-3663057518eb9acf9b1e72f47dcb07038e6b7368.tar.gz rails-3663057518eb9acf9b1e72f47dcb07038e6b7368.tar.bz2 rails-3663057518eb9acf9b1e72f47dcb07038e6b7368.zip | |
Merge pull request #7587 from elia/fix-too-eager-loading
Should not eager_load app/assets
Conflicts:
railties/CHANGELOG.md
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/application/paths_test.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/railties/test/application/paths_test.rb b/railties/test/application/paths_test.rb index 4029984ce9..f85c284c25 100644 --- a/railties/test/application/paths_test.rb +++ b/railties/test/application/paths_test.rb @@ -59,6 +59,8 @@ 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 @@ -73,6 +75,7 @@ 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" |