diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-12-19 14:16:29 -0800 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-12-19 14:55:34 -0800 |
| commit | 2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8 (patch) | |
| tree | 842f600e072f0ed0b13062a82f36cb7be6129433 /railties/test/application/middleware_test.rb | |
| parent | 352680c1d394a2177437f20673ede0753d651913 (diff) | |
| download | rails-2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8.tar.gz rails-2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8.tar.bz2 rails-2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8.zip | |
Merge pull request #18100 from chancancode/serve_static_files
Allow static asset serving from env variable (enhanced!)
Conflicts:
railties/CHANGELOG.md
Diffstat (limited to 'railties/test/application/middleware_test.rb')
| -rw-r--r-- | railties/test/application/middleware_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb index caef39d16f..c64fe082f3 100644 --- a/railties/test/application/middleware_test.rb +++ b/railties/test/application/middleware_test.rb @@ -113,8 +113,8 @@ module ApplicationTests assert !middleware.include?("Rack::Lock") end - test "removes static asset server if serve_static_assets is disabled" do - add_to_config "config.serve_static_assets = false" + test "removes static asset server if serve_static_files is disabled" do + add_to_config "config.serve_static_files = false" boot! assert !middleware.include?("ActionDispatch::Static") end |