aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application/middleware
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-11-16 14:40:38 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2015-11-16 14:40:38 +0100
commit0ebb0f61c3c66df517c1277265f337a09928da86 (patch)
tree6e929ad8ccf82e65e650e3cf60cd5dca3052b2ed /railties/test/application/middleware
parent9dcf330946a8bef0a0e2fb6e6d1bb92eae62a1da (diff)
parentce83dc98bb042b71c19bec600c2f3885efa33adf (diff)
downloadrails-0ebb0f61c3c66df517c1277265f337a09928da86.tar.gz
rails-0ebb0f61c3c66df517c1277265f337a09928da86.tar.bz2
rails-0ebb0f61c3c66df517c1277265f337a09928da86.zip
Merge pull request #22298 from yuki24/make-static-index-part-of-public-file-server-config
Make the `config.static_index` option part of the `config.public_server` option
Diffstat (limited to 'railties/test/application/middleware')
-rw-r--r--railties/test/application/middleware/static_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/test/application/middleware/static_test.rb b/railties/test/application/middleware/static_test.rb
index 5366537dc2..1246e20d94 100644
--- a/railties/test/application/middleware/static_test.rb
+++ b/railties/test/application/middleware/static_test.rb
@@ -44,7 +44,7 @@ module ApplicationTests
assert_equal 'public, max-age=60', last_response.headers["Cache-Control"]
end
- test "static_index defaults to 'index'" do
+ test "public_file_server.index_name defaults to 'index'" do
app_file "public/index.html", "/index.html"
require "#{app_path}/config/environment"
@@ -54,10 +54,10 @@ module ApplicationTests
assert_equal "/index.html\n", last_response.body
end
- test "static_index configurable" do
+ test "public_file_server.index_name configurable" do
app_file "public/other-index.html", "/other-index.html"
- add_to_config "config.static_index = 'other-index'"
-
+ add_to_config "config.public_file_server.index_name = 'other-index'"
+
require "#{app_path}/config/environment"
get '/'