1 files changed, 21 insertions, 4 deletions
diff --git a/railties/test/application/middleware/static_test.rb b/railties/test/application/middleware/static_test.rb
index 1a46cd3568..1246e20d94 100644
--- a/railties/test/application/middleware/static_test.rb
+++ b/railties/test/application/middleware/static_test.rb
@@ -27,7 +27,24 @@ module ApplicationTests
       assert_not last_response.headers.has_key?('Cache-Control'), "Cache-Control should not be set"
     end
 
-    test "static_index defaults to 'index'" do
+    test "headers for static files are configurable" do
+      app_file "public/about.html", 'static'
+      add_to_config <<-CONFIG
+        config.public_file_server.headers = {
+          "Access-Control-Allow-Origin" => "http://rubyonrails.org",
+          "Cache-Control"               => "public, max-age=60"
+        }
+      CONFIG
+
+      require "#{app_path}/config/environment"
+
+      get '/about.html'
+
+      assert_equal 'http://rubyonrails.org', last_response.headers["Access-Control-Allow-Origin"]
+      assert_equal 'public, max-age=60',     last_response.headers["Cache-Control"]
+    end
+
+    test "public_file_server.index_name defaults to 'index'" do
       app_file "public/index.html", "/index.html"
       
       require "#{app_path}/config/environment"
@@ -37,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 '/'