From 3663057518eb9acf9b1e72f47dcb07038e6b7368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 29 Oct 2012 06:02:16 -0700 Subject: Merge pull request #7587 from elia/fix-too-eager-loading Should not eager_load app/assets Conflicts: railties/CHANGELOG.md --- railties/test/application/paths_test.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'railties/test') 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" -- cgit v1.2.3