diff options
Diffstat (limited to 'actionpack')
19 files changed, 122 insertions, 48 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index ec53efa6b7..cf662500a4 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,7 @@ ## Rails 4.0.0 (unreleased) ## +* Integration tests support the `OPTIONS` method. *Jeremy Kemper* + * `expires_in` accepts a `must_revalidate` flag. If true, "must-revalidate" is added to the Cache-Control header. *fxn* diff --git a/actionpack/README.rdoc b/actionpack/README.rdoc index 076a93bbcd..1fdc57e14d 100644 --- a/actionpack/README.rdoc +++ b/actionpack/README.rdoc @@ -218,7 +218,7 @@ A short rundown of some of the major features: def show # the output of the method will be cached as - # ActionController::Base.page_cache_directory + "/weblog/show/n.html" + # ActionController::Base.page_cache_directory + "/weblog/show.html" # and the web server will pick it up without even hitting Rails end diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index fd6a46fbec..3d915cf513 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -42,8 +42,8 @@ module AbstractController controller.public_instance_methods(true) end - # The list of hidden actions to an empty array. Defaults to an - # empty array. This can be modified by other modules or subclasses + # The list of hidden actions. Defaults to an empty array. + # This can be modified by other modules or subclasses # to specify particular actions as hidden. # # ==== Returns diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 08b7ff49c2..0287e7728b 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -56,6 +56,12 @@ module ActionDispatch process :head, path, parameters, headers end + # Performs a OPTIONS request with the given parameters. See +#get+ for + # more details. + def options(path, parameters = nil, headers = nil) + process :options, path, parameters, headers + end + # Performs an XMLHttpRequest request with the given parameters, mirroring # a request from the Prototype library. # @@ -312,7 +318,7 @@ module ActionDispatch @integration_session = Integration::Session.new(app) end - %w(get post put head delete cookies assigns + %w(get post put head delete options cookies assigns xml_http_request xhr get_via_redirect post_via_redirect).each do |method| define_method(method) do |*args| reset! unless integration_session diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 44e24fecd1..cae345a1d6 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -1102,14 +1102,14 @@ module ActionView # <% end %> # # In the example above, if @post is a new record, it will use "Create Post" as - # submit button label, otherwise, it uses "Update Post". + # button label, otherwise, it uses "Update Post". # - # Those labels can be customized using I18n, under the helpers.submit key and accept - # the %{model} as translation interpolation: + # Those labels can be customized using I18n, under the helpers.submit key + # (the same as submit helper) and accept the %{model} as translation interpolation: # # en: # helpers: - # button: + # submit: # create: "Create a %{model}" # update: "Confirm changes to %{model}" # @@ -1117,7 +1117,7 @@ module ActionView # # en: # helpers: - # button: + # submit: # post: # create: "Add %{model}" # diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index 99e1dc7966..64c4682015 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -105,6 +105,12 @@ class SessionTest < ActiveSupport::TestCase @session.head(path,params,headers) end + def test_options + path = "/index"; params = "blah"; headers = {:location => 'blah'} + @session.expects(:process).with(:options,path,params,headers) + @session.options(path,params,headers) + end + def test_xml_http_request_get path = "/index"; params = "blah"; headers = {:location => 'blah'} headers_after_xhr = headers.merge( @@ -155,6 +161,16 @@ class SessionTest < ActiveSupport::TestCase @session.xml_http_request(:head,path,params,headers) end + def test_xml_http_request_options + path = "/index"; params = "blah"; headers = {:location => 'blah'} + headers_after_xhr = headers.merge( + "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest", + "HTTP_ACCEPT" => "text/javascript, text/html, application/xml, text/xml, */*" + ) + @session.expects(:process).with(:options,path,params,headers_after_xhr) + @session.xml_http_request(:options,path,params,headers) + end + def test_xml_http_request_override_accept path = "/index"; params = "blah"; headers = {:location => 'blah', "HTTP_ACCEPT" => "application/xml"} headers_after_xhr = headers.merge( @@ -212,7 +228,7 @@ class IntegrationTestUsesCorrectClass < ActionDispatch::IntegrationTest @integration_session.stubs(:generic_url_rewriter) @integration_session.stubs(:process) - %w( get post head put delete ).each do |verb| + %w( get post head put delete options ).each do |verb| assert_nothing_raised("'#{verb}' should use integration test methods") { __send__(verb, '/') } end end diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb index e086d99b19..092ca3e20a 100644 --- a/actionpack/test/dispatch/static_test.rb +++ b/actionpack/test/dispatch/static_test.rb @@ -1,5 +1,6 @@ # encoding: utf-8 require 'abstract_unit' +require 'rbconfig' module StaticTests def test_serves_dynamic_content @@ -35,32 +36,85 @@ module StaticTests assert_html "means hello in Japanese\n", get("/foo/#{Rack::Utils.escape("こんにちは.html")}") end - def test_serves_static_file_with_encoded_pchar - assert_html "/foo/foo!bar.html", get("/foo/foo%21bar.html") - assert_html "/foo/foo$bar.html", get("/foo/foo%24bar.html") - assert_html "/foo/foo&bar.html", get("/foo/foo%26bar.html") - assert_html "/foo/foo'bar.html", get("/foo/foo%27bar.html") - assert_html "/foo/foo(bar).html", get("/foo/foo%28bar%29.html") - assert_html "/foo/foo*bar.html", get("/foo/foo%2Abar.html") - assert_html "/foo/foo+bar.html", get("/foo/foo%2Bbar.html") - assert_html "/foo/foo,bar.html", get("/foo/foo%2Cbar.html") - assert_html "/foo/foo;bar.html", get("/foo/foo%3Bbar.html") - assert_html "/foo/foo:bar.html", get("/foo/foo%3Abar.html") - assert_html "/foo/foo@bar.html", get("/foo/foo%40bar.html") - end - - def test_serves_static_file_with_unencoded_pchar - assert_html "/foo/foo!bar.html", get("/foo/foo!bar.html") - assert_html "/foo/foo$bar.html", get("/foo/foo$bar.html") - assert_html "/foo/foo&bar.html", get("/foo/foo&bar.html") - assert_html "/foo/foo'bar.html", get("/foo/foo'bar.html") - assert_html "/foo/foo(bar).html", get("/foo/foo(bar).html") - assert_html "/foo/foo*bar.html", get("/foo/foo*bar.html") - assert_html "/foo/foo+bar.html", get("/foo/foo+bar.html") - assert_html "/foo/foo,bar.html", get("/foo/foo,bar.html") - assert_html "/foo/foo;bar.html", get("/foo/foo;bar.html") - assert_html "/foo/foo:bar.html", get("/foo/foo:bar.html") - assert_html "/foo/foo@bar.html", get("/foo/foo@bar.html") + + def test_serves_static_file_with_exclamation_mark_in_filename + with_static_file "/foo/foo!bar.html" do |file| + assert_html file, get("/foo/foo%21bar.html") + assert_html file, get("/foo/foo!bar.html") + end + end + + def test_serves_static_file_with_dollar_sign_in_filename + with_static_file "/foo/foo$bar.html" do |file| + assert_html file, get("/foo/foo%24bar.html") + assert_html file, get("/foo/foo$bar.html") + end + end + + def test_serves_static_file_with_ampersand_in_filename + with_static_file "/foo/foo&bar.html" do |file| + assert_html file, get("/foo/foo%26bar.html") + assert_html file, get("/foo/foo&bar.html") + end + end + + def test_serves_static_file_with_apostrophe_in_filename + with_static_file "/foo/foo'bar.html" do |file| + assert_html file, get("/foo/foo%27bar.html") + assert_html file, get("/foo/foo'bar.html") + end + end + + def test_serves_static_file_with_parentheses_in_filename + with_static_file "/foo/foo(bar).html" do |file| + assert_html file, get("/foo/foo%28bar%29.html") + assert_html file, get("/foo/foo(bar).html") + end + end + + def test_serves_static_file_with_plus_sign_in_filename + with_static_file "/foo/foo+bar.html" do |file| + assert_html file, get("/foo/foo%2Bbar.html") + assert_html file, get("/foo/foo+bar.html") + end + end + + def test_serves_static_file_with_comma_in_filename + with_static_file "/foo/foo,bar.html" do |file| + assert_html file, get("/foo/foo%2Cbar.html") + assert_html file, get("/foo/foo,bar.html") + end + end + + def test_serves_static_file_with_semi_colon_in_filename + with_static_file "/foo/foo;bar.html" do |file| + assert_html file, get("/foo/foo%3Bbar.html") + assert_html file, get("/foo/foo;bar.html") + end + end + + def test_serves_static_file_with_at_symbol_in_filename + with_static_file "/foo/foo@bar.html" do |file| + assert_html file, get("/foo/foo%40bar.html") + assert_html file, get("/foo/foo@bar.html") + end + end + + # Windows doesn't allow \ / : * ? " < > | in filenames + unless RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ + def test_serves_static_file_with_colon + with_static_file "/foo/foo:bar.html" do |file| + assert_html file, get("/foo/foo%3Abar.html") + assert_html file, get("/foo/foo:bar.html") + end + end + + def test_serves_static_file_with_asterisk + with_static_file "/foo/foo*bar.html" do |file| + assert_html file, get("/foo/foo%2Abar.html") + assert_html file, get("/foo/foo*bar.html") + end + end end private @@ -73,6 +127,14 @@ module StaticTests def get(path) Rack::MockRequest.new(@app).request("GET", path) end + + def with_static_file(file) + path = "#{FIXTURE_LOAD_PATH}/public" + file + File.open(path, "wb+") { |f| f.write(file) } + yield file + ensure + File.delete(path) + end end class StaticTest < ActiveSupport::TestCase diff --git a/actionpack/test/fixtures/public/foo/foo!bar.html b/actionpack/test/fixtures/public/foo/foo!bar.html deleted file mode 100644 index 2928f2717f..0000000000 --- a/actionpack/test/fixtures/public/foo/foo!bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo!bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo$bar.html b/actionpack/test/fixtures/public/foo/foo$bar.html deleted file mode 100644 index 4f837df01d..0000000000 --- a/actionpack/test/fixtures/public/foo/foo$bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo$bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo&bar.html b/actionpack/test/fixtures/public/foo/foo&bar.html deleted file mode 100644 index c194e8de87..0000000000 --- a/actionpack/test/fixtures/public/foo/foo&bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo&bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo'bar.html b/actionpack/test/fixtures/public/foo/foo'bar.html deleted file mode 100644 index 25c3275736..0000000000 --- a/actionpack/test/fixtures/public/foo/foo'bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo'bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo(bar).html b/actionpack/test/fixtures/public/foo/foo(bar).html deleted file mode 100644 index 94fa4cb944..0000000000 --- a/actionpack/test/fixtures/public/foo/foo(bar).html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo(bar).html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo*bar.html b/actionpack/test/fixtures/public/foo/foo*bar.html deleted file mode 100644 index 79d5194c8d..0000000000 --- a/actionpack/test/fixtures/public/foo/foo*bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo*bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo+bar.html b/actionpack/test/fixtures/public/foo/foo+bar.html deleted file mode 100644 index 0fdc2ecabc..0000000000 --- a/actionpack/test/fixtures/public/foo/foo+bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo+bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo,bar.html b/actionpack/test/fixtures/public/foo/foo,bar.html deleted file mode 100644 index f040fce197..0000000000 --- a/actionpack/test/fixtures/public/foo/foo,bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo,bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo:bar.html b/actionpack/test/fixtures/public/foo/foo:bar.html deleted file mode 100644 index 7900a2642b..0000000000 --- a/actionpack/test/fixtures/public/foo/foo:bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo:bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo;bar.html b/actionpack/test/fixtures/public/foo/foo;bar.html deleted file mode 100644 index 2248376954..0000000000 --- a/actionpack/test/fixtures/public/foo/foo;bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo;bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo=bar.html b/actionpack/test/fixtures/public/foo/foo=bar.html deleted file mode 100644 index 206f69e286..0000000000 --- a/actionpack/test/fixtures/public/foo/foo=bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo=bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo@bar.html b/actionpack/test/fixtures/public/foo/foo@bar.html deleted file mode 100644 index 4e8e90f9b8..0000000000 --- a/actionpack/test/fixtures/public/foo/foo@bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo@bar.html
\ No newline at end of file |