diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-28 18:53:00 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-28 18:53:00 -0300 |
| commit | 73aab036eeeb297dc85dc812f54e26aa943f48f7 (patch) | |
| tree | 4176d0af72d6975483f4b13924608b5bf106d43d /actionpack/test | |
| parent | 233ceda594c19331f493ed1436c8c26b5d1aaf1b (diff) | |
| parent | 3ff39494cdea67502dbd6465358eca3e14a84d6b (diff) | |
| download | rails-73aab036eeeb297dc85dc812f54e26aa943f48f7.tar.gz rails-73aab036eeeb297dc85dc812f54e26aa943f48f7.tar.bz2 rails-73aab036eeeb297dc85dc812f54e26aa943f48f7.zip | |
Merge pull request #20017 from eliotsykes/configurable-static-index-filename
config.static_index configures directory Index "index.html" filename
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/dispatch/static_test.rb | 14 | ||||
| -rw-r--r-- | actionpack/test/fixtures/public/foo/other-index.html | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/public/other-index.html | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/公共/foo/other-index.html | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/公共/other-index.html | 1 |
5 files changed, 18 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb index 93e5c85a97..e729cc44f9 100644 --- a/actionpack/test/dispatch/static_test.rb +++ b/actionpack/test/dispatch/static_test.rb @@ -57,6 +57,7 @@ module StaticTests def test_serves_static_index_file_in_directory assert_html "/foo/index.html", get("/foo/index.html") + assert_html "/foo/index.html", get("/foo/index") assert_html "/foo/index.html", get("/foo/") assert_html "/foo/index.html", get("/foo") end @@ -260,6 +261,19 @@ class StaticTest < ActiveSupport::TestCase } assert_equal(DummyApp.call(nil), @app.call(env)) end + + def test_non_default_static_index + @app = ActionDispatch::Static.new(DummyApp, @root, "public, max-age=60", "other-index") + assert_html "/other-index.html", get("/other-index.html") + assert_html "/other-index.html", get("/other-index") + assert_html "/other-index.html", get("/") + assert_html "/other-index.html", get("") + assert_html "/foo/other-index.html", get("/foo/other-index.html") + assert_html "/foo/other-index.html", get("/foo/other-index") + assert_html "/foo/other-index.html", get("/foo/") + assert_html "/foo/other-index.html", get("/foo") + end + end class StaticEncodingTest < StaticTest diff --git a/actionpack/test/fixtures/public/foo/other-index.html b/actionpack/test/fixtures/public/foo/other-index.html new file mode 100644 index 0000000000..51c90c26ea --- /dev/null +++ b/actionpack/test/fixtures/public/foo/other-index.html @@ -0,0 +1 @@ +/foo/other-index.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/other-index.html b/actionpack/test/fixtures/public/other-index.html new file mode 100644 index 0000000000..0820dfcb6e --- /dev/null +++ b/actionpack/test/fixtures/public/other-index.html @@ -0,0 +1 @@ +/other-index.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/公共/foo/other-index.html b/actionpack/test/fixtures/公共/foo/other-index.html new file mode 100644 index 0000000000..51c90c26ea --- /dev/null +++ b/actionpack/test/fixtures/公共/foo/other-index.html @@ -0,0 +1 @@ +/foo/other-index.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/公共/other-index.html b/actionpack/test/fixtures/公共/other-index.html new file mode 100644 index 0000000000..0820dfcb6e --- /dev/null +++ b/actionpack/test/fixtures/公共/other-index.html @@ -0,0 +1 @@ +/other-index.html
\ No newline at end of file |