aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorYuki Nishijima <mail@yukinishijima.net>2015-11-14 21:57:56 -0800
committerYuki Nishijima <mail@yukinishijima.net>2015-11-16 03:39:24 -0800
commitce83dc98bb042b71c19bec600c2f3885efa33adf (patch)
tree05679bcf98b6d1c9c8deddcd448565547cb9cf73 /railties/test
parentfdf5d4dfc30ce5a599392305567c0230c21b9b84 (diff)
downloadrails-ce83dc98bb042b71c19bec600c2f3885efa33adf.tar.gz
rails-ce83dc98bb042b71c19bec600c2f3885efa33adf.tar.bz2
rails-ce83dc98bb042b71c19bec600c2f3885efa33adf.zip
Make the `static_index` config part of the `config.public_server` config
Also call it `public_server.index_name` so it'll make more sense.
Diffstat (limited to 'railties/test')
-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 '/'