diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-07-05 05:41:09 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-07-05 05:41:09 -0700 |
| commit | cb8ac7d377746e39cc512bb0fbfc6a667e91c0cd (patch) | |
| tree | 3048c24fa7a968d9398b3a7f71e83c09d3ead2f7 | |
| parent | 5534733f69d36312b1a4e34dee61b41504a2c9e2 (diff) | |
| parent | 0303c2325fab253adf5e4a0b738cb469c048f008 (diff) | |
| download | rails-cb8ac7d377746e39cc512bb0fbfc6a667e91c0cd.tar.gz rails-cb8ac7d377746e39cc512bb0fbfc6a667e91c0cd.tar.bz2 rails-cb8ac7d377746e39cc512bb0fbfc6a667e91c0cd.zip | |
Merge pull request #6957 from francois2metz/options_method
Add the options method to action_controller testcase.
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 9 | ||||
| -rw-r--r-- | actionpack/test/controller/test_case_test.rb | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index a1f29ea1bc..555f4de3ac 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -430,8 +430,13 @@ module ActionController end # Executes a request simulating HEAD HTTP method and set/volley the response - def head(action, parameters = nil, session = nil, flash = nil) - process(action, "HEAD", parameters, session, flash) + def head(action, *args) + process(action, "HEAD", *args) + end + + # Executes a request simulating OPTIONS HTTP method and set/volley the response + def options(action, *args) + process(action, "OPTIONS", *args) end def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil) diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb index 49137946fe..f868451678 100644 --- a/actionpack/test/controller/test_case_test.rb +++ b/actionpack/test/controller/test_case_test.rb @@ -197,6 +197,11 @@ XML assert_raise(NoMethodError) { head :test_params, "document body", :id => 10 } end + def test_options + options :test_params + assert_equal 200, @response.status + end + def test_process_without_flash process :set_flash assert_equal '><', flash['test'] |