aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/static_test.rb
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2014-08-27 14:00:37 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2014-08-27 14:00:37 -0500
commit728f2ebdb6b6f73587e67cd7afb718920bbce2fd (patch)
treea5e04e8b52c47c007dee4861c5f26383674ff9d7 /actionpack/test/dispatch/static_test.rb
parent5bcd5a32abf14b371424131dce819139de09c74c (diff)
parent0b1a87f73cca3da23b65f3dfb19daeac436ab2ee (diff)
downloadrails-728f2ebdb6b6f73587e67cd7afb718920bbce2fd.tar.gz
rails-728f2ebdb6b6f73587e67cd7afb718920bbce2fd.tar.bz2
rails-728f2ebdb6b6f73587e67cd7afb718920bbce2fd.zip
Merge pull request #16544 from schneems/schneems/death-to-dir-glob
Refactor out Dir.glob from ActionDispatch::Static
Diffstat (limited to 'actionpack/test/dispatch/static_test.rb')
-rw-r--r--actionpack/test/dispatch/static_test.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
index 97affc7b21..6f7373201c 100644
--- a/actionpack/test/dispatch/static_test.rb
+++ b/actionpack/test/dispatch/static_test.rb
@@ -37,6 +37,10 @@ module StaticTests
assert_html "/foo/index.html", get("/foo")
end
+ def test_serves_file_with_same_name_before_index_in_directory
+ assert_html "/bar.html", get("/bar")
+ end
+
def test_served_static_file_with_non_english_filename
jruby_skip "Stop skipping if following bug gets fixed: " \
"http://jira.codehaus.org/browse/JRUBY-7192"