aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Integration tests support the OPTIONS http method"Rafael Mendonça França2013-05-161-17/+1
| | | | | | | | | | | | | | This reverts commit ad46884af567d6f8d6d8d777f372c39e81a560ba. Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/testing/integration.rb actionpack/test/controller/integration_test.rb Reason: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638.
* Revert "Add the options method to action_controller testcase."Rafael Mendonça França2013-05-161-5/+0
| | | | | | | | | | | | This reverts commit 0303c2325fab253adf5e4a0b738cb469c048f008. Conflicts: actionpack/lib/action_controller/test_case.rb REASON: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638.
* Merge pull request #10591 from acapilleri/cond_callback_testAaron Patterson2013-05-151-0/+13
|\ | | | | add test for skip_before_filter with condition
| * add test for skip_before_filter with conditionAngelo capilleri2013-05-131-0/+13
| |
* | use public api for testing rather than grabbing instance variablesAaron Patterson2013-05-141-1/+1
|/
* Fix that JSON and XML exception responses should give the HTTP error message ↵Jeremy Kemper2013-05-081-2/+2
| | | | for their status, by default, not the message from the underlying exception
* Test that #fresh_when accepts an arrayBrandon Keepers2013-05-071-2/+19
| | | | https://github.com/rails/etagger/pull/3
* Add support for extra options to `force_ssl`Andrew White2013-04-251-14/+106
| | | | | | | | This commit adds support for passing additional url options along with a :status option and any of the flash-related options to `redirect_to` (i.e. :flash, :alert & :notice). Closes #7570.
* Use `request.fullpath` to build redirect url in `force_ssl`Andrew White2013-04-251-0/+63
| | | | | | | | | | | The `force_ssl` command now builds the redirect url from `request.fullpath`. This ensures that the format is maintained and it doesn't redirect to a route that has the same parameters but is defined earlier in `routes.rb`. Also any optional segments are maintained. Fixes #7528. Fixes #9061. Fixes #10305.
* Passing subdomain: '' to url_for removes the subdomain (instead of adding a ↵Derek Watson2013-04-181-0/+7
| | | | | | leading .) Adding a boolean route constraint checks for presence/absence of request property
* Merge pull request #9604 from sgrif/live_streaming_exceptionsRafael Mendonça França2013-04-081-1/+75
|\ | | | | Exceptions raised when using ActionController::Live cause server crash
| * Exception handling for controllers using ActionController::LiveSean Griffin2013-03-181-1/+75
| | | | | | | | | | | | | | | | | | Any exceptions that occured at the view or controller level for a controller using ActionController::Live would cause the server to either hang with an open socket indefinitely, or immediately crash (depending on whether the server was launched with rails s or directly). Changed the behavior of exceptions to act the same as streaming templates for html requests, and allow for an on_error callback if needed.
* | Remove comments about removing LegacyKeyGenerator in 4.1Trevor Turk2013-04-032-2/+0
| |
* | Rename DummyKeyGenerator -> LegacyKeyGeneratorTrevor Turk2013-04-022-4/+4
| |
* | fix request methods testVipul A M2013-03-311-6/+2
| |
* | Fix typos in AP: "overriden" => "overridden"Carlos Antonio da Silva2013-03-303-31/+31
| |
* | Refactored to remove unused variableAnupam Choudhury2013-03-281-1/+1
| |
* | Merge pull request #8458 from ↵Rafael Mendonça França2013-03-271-0/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | lucisferre/improve-layout-override-fallback-behavior Provides standard layout lookup behavior for method and proc cases Conflicts: actionpack/CHANGELOG.md
| * | Provides standard layout lookup behavior for method and proc casesChris Nicola2013-03-271-0/+24
| | | | | | | | | | | | | | | | | | | | | When setting the layout either by referencing a method or supplying a Proc there is no way to fall back to the default lookup behavior if desired. This patch allows fallback to the layout lookup behavior when returning nil from the proc or method.
* | | Update tests for #9704, named route collisionsJeremy Kemper2013-03-241-5/+6
| | | | | | | | | | | | | | | * Fix named route collision in mount test fixture * Update controller named route precedence test
* | | Fix broken ActionController#action_missingJanko Luin2013-03-201-0/+12
| | | | | | | | | | | | | | | A recent change introduced the assumption that all controller actions are known beforehand, which is not true when using action_missing.
* | | Digest auth should not 500 when given a basic header.Brad Dunbar2013-03-181-0/+8
| |/ |/|
* | Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacksCarlos Antonio da Silva2013-03-181-0/+9
|\ \ | | | | | | i18n locale fallback for localized views
| * | Include I18n fallbacks in :locale lookup contextJuan Barreneche2013-03-161-0/+9
| | |
* | | remove ancient TODOs [ci skip].Yves Senn2013-03-181-2/+0
| | |
* | | Fix rake test warnings in actionpackMack Earnhardt2013-03-171-1/+1
|/ /
* | `Http::Headers` directly modifies the passed environment.Yves Senn2013-03-151-0/+22
| | | | | | | | | | | | | | | | | | The env hash passed to `Http::Headers#new` must be in env format. Also be aware that the passed hash is modified directly. docs and test-cases for setting headers/env in functional tests. Follow up to #9700.
* | Handle conditional get in live requests - this will prevent error when using ↵Bernard Potocki2013-03-141-0/+15
| | | | | | | | stale on live streams(issue #9636)
* | allow headers and env to be passed in `IntegrationTest`.Yves Senn2013-03-131-0/+15
| | | | | | | | Closes #6513.
* | Fix warningsCarlos Antonio da Silva2013-03-071-2/+2
| |
* | Allow use of assert_template with the :file option.Justin Coyne2013-03-011-0/+35
| | | | | | | | This worked in Rails 3.2, but was a regression in 4.0.0.beta1
* | Add tests for #9441Francesco Rodriguez2013-02-261-0/+16
|/
* fix respond_to without blocks not working if one of the blocks is allgrosser2013-02-241-0/+21
|
* Rack::Test::UploadedFile is a permitted scalarFabio Kreusch2013-02-211-1/+2
|
* Remove XML Parser from ActionDispatchPrem Sichanugrist2013-02-201-131/+15
| | | | | If you want an ability to parse XML parameters, please install `actionpack-xml_parser` gem.
* Fix #9168 Initialize NullCookieJar with all options needed for KeyGeneratorAndrey Chernih2013-02-081-0/+35
|
* Missing or unneeded require extract_optionsAkira Matsuda2013-02-012-0/+2
|
* Remove yaml Proc param parser testBrendon Murphy2013-01-281-13/+0
| | | | | | | | I don't believe this test is exercising any explicit params_parser behavior that the other two Proc tests aren't already doing. Given that we now know it's a bad idea to load user input via YAML.load, somebody reading this test might get a dangerous idea about building out a YAML params parser.
* Merge pull request #9032 from firmhouse/head-breaks-csrfSantiago Pastorino2013-01-281-0/+4
|\ | | | | Make HEAD work / convert to GET once more
| * Added a test that shows that a HEAD request does not normally pass CSRF ↵Michiel Sikkes2013-01-221-0/+4
| | | | | | | | protection
* | ActionDispatch::Http::UploadedFile is a permitted scalar [Closes #9051]Xavier Noria2013-01-231-1/+2
|/
* Lets kepp using Ruby 1.9 syntaxRafael Mendonça França2013-01-222-37/+37
|
* Restore I18n.locale after running testsAkira Matsuda2013-01-221-1/+7
|
* Make sure to reset default_url_optionsAkira Matsuda2013-01-221-1/+5
|
* Add missing assert callsCarlos Antonio da Silva2013-01-201-2/+2
|
* strong parameters filters permitted scalarsXavier Noria2013-01-202-17/+164
|
* Restore and adapt the implementation reverted atRafael Mendonça França2013-01-192-8/+8
| | | | | | https://github.com/rails/rails/commit/cc1c3c5be061e7572018f734e5239750ab449e3f Now instead of raise, we log by default in development and test
* Added ability to raise or log on unpermitted params.Thomas Drake-Brockman2013-01-202-0/+83
|
* Remove useless || operationCarlos Antonio da Silva2013-01-171-1/+1
|
* Removing : warning: ambiguous first argument;Arun Agrawal2013-01-171-4/+4
|