aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
Commit message (Collapse)AuthorAgeFilesLines
* Copy shallow options from normal options when using scopeAndrew White2014-03-081-0/+48
| | | | | | If the options :shallow_prefix and :shallow_path are not set in the scope options then copy them from the normal :as and :path options if they are set.
* Pull namespace defaults out of the options hashAndrew White2014-03-081-0/+130
| | | | | | | If a developer has specified either :path or :as in the options hash then these should be used as the defaults for :shallow_path and :shallow_prefix. Fixes #14241.
* Only use shallow nested scope when depth is > 1Andrew White2014-03-081-0/+60
| | | | | | | | By tracking the depth of resource nesting we can push the need for nested shallow scoping to only those routes that are nested more than one deep. This allows us to keep the fix for #12498 and fix the regression in #14224. Fixes #14224.
* Merge pull request #14280 from joho/make_csrf_failure_logging_optionalSantiago Pastorino2014-03-081-0/+16
|\ | | | | Make CSRF failure logging optional/configurable.
| * Make CSRF failure logging optional/configurable.John Barton (joho)2014-03-051-0/+16
| | | | | | | | | | Added the log_warning_on_csrf_failure option to ActionController::RequestForgeryProtection which is on by default.
* | Do note remove `Content-Type` when `render :body`Prem Sichanugrist2014-03-052-25/+12
|/ | | | | | | | | | | | | `render :body` should just not set the `Content-Type` header. By removing the header, it breaks the compatibility with other parts. After this commit, `render :body` will returns `text/html` content type, sets by default from `ActionDispatch::Response`, and it will preserve the overridden content type if you override it. Fixes #14197, #14238 This partially reverts commit 3047376870d4a7adc7ff15c3cb4852e073c8f1da.
* Variants in ActionView::DigestorPiotr Chmolowski2014-03-041-2/+2
| | | | | | | | | | | Take variants into account when calculating template digests in ActionView::Digest. Digestor#digest now takes a hash as an argument to support variants and allow more flexibility in the future. Old-style arguments have been deprecated. Fixes #14242
* Refactor tests from BaseRackTest into BaseRequestTestZachary Scott2014-03-012-370/+386
|
* make sure we wait for the threads to shut down before asserting closureAaron Patterson2014-02-281-0/+1
|
* use built-in exception handling in live controllersAaron Patterson2014-02-281-15/+17
| | | | | | when an exception happens in an action before the response has been committed, then we should re-raise the exception in the main thread. This lets us reuse the existing exception handling.
* live controllers should have live responsesAaron Patterson2014-02-281-13/+2
| | | | | | detect the type of controller we're testing and return the right type of response based on that controller. This allows us to stop doing the weird sleep thing.
* set the error callback to a nice default in case nobody set an error ↵Aaron Patterson2014-02-281-0/+7
| | | | callback and an error happens
* Fix controller test not resetting @_url_optionsTony Wooster2014-02-261-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 4f2cd3e9 introduced a bug by reordering the call to `@controller.recycle!` above the call to `build_request_uri`. The impact of this was that the `@_url_options` cache ends up not being reset between building a request URI (occurring within the test controller) and the firing of the actual request. We encountered this bug because we had the following setup: class MinimumReproducibleController < ActionController::Base before_filter { @param = 'param' } def index render text: url_for(params) end def default_url_options { custom_opt: @param } end end def test_index get :index # builds url, then fires actual request end The first step in `get :index` in the test suite would populate the @_url_options cache. The subsequent call to `url_for` inside of the controller action would then utilize the uncleared cache, thus never calling the now-updated default_url_options. This commit fixes this bug calling recycle! twice, and removes a call to set response_body, which should no longer be needed since we're recycling the request object explicitly.
* Simple Sungularize ActionController::UnpermittedParameters error in case ↵Serj L2014-02-241-4/+26
| | | | when only 1 parameter is unpermitted.
* Add `#no_content_type` attribute to `AD::Response`Prem Sichanugrist2014-02-181-1/+1
| | | | | Setting this attribute to `true` will remove the content type header from the request. This is use in `render :body` feature.
* Introduce `render :html` for render HTML stringPrem Sichanugrist2014-02-181-0/+190
| | | | | | | | | This is an option for to HTML content with a content type of `text/html`. This rendering option calls `ERB::Util.html_escape` internally to escape unsafe HTML string, so you will have to mark your string as html safe if you have any HTML tag in it. Please see #12374 for more detail.
* Introduce `render :plain` for render plain textPrem Sichanugrist2014-02-181-0/+168
| | | | | | | | This is as an option to render content with a content type of `text/plain`. This is the preferred option if you are planning to render a plain text content. Please see #12374 for more detail.
* Update hash format for render_text_testPrem Sichanugrist2014-02-181-18/+18
|
* Introduce `render :body` for render raw contentPrem Sichanugrist2014-02-182-0/+183
| | | | | | | | | | | | This is an option for sending a raw content back to browser. Note that this rendering option will unset the default content type and does not include "Content-Type" header back in the response. You should only use this option if you are expecting the "Content-Type" header to not be set. More information on "Content-Type" header can be found on RFC 2616, section 7.2.1. Please see #12374 for more detail.
* Correct prestreaming controller response status.Kevin Casey2014-02-151-0/+18
| | | | | | if the controller action has not yet streamed any data, actions should process as normal, and errors should trigger the appropriate behavior (500, or in the case of ActionController::BadRequest, a 400 Bad Request)
* No variant should also be picked up by variant.any if variant.none is not ↵David Heinemeier Hansson2014-02-131-0/+4
| | | | defined (just like any other variant)
* Check if variant array contains only symbolsŁukasz Strzałkowski2014-02-131-0/+8
|
* Variant negotiationLukasz Strzalkowski2014-02-132-1/+26
| | | | | | | | | | | | | | Allow setting `request.variant` as an array - an order in which they will be rendered. For example: request.variant = [:tablet, :phone] respond_to do |format| format.html.none format.html.phone # this gets rendered end
* Fixed broken flash testsGodfrey Chan2014-02-111-4/+4
|
* Re-write legacy (marshal) cookies on readGodfrey Chan2014-02-111-15/+17
|
* Convert FlashHash in a Hash with indifferent accessGuillermo Iguaran2014-02-111-0/+10
|
* Changed the tests to ensure HybridSerializer actually migrates the cookies ↵Godfrey Chan2014-02-111-10/+18
| | | | (currently failing)
* Fixed minor typo in test codeGodfrey Chan2014-02-111-1/+1
|
* Tests for the HybridSerializerRafael Mendonça França2014-02-111-0/+68
|
* Removed an old testGodfrey Chan2014-02-111-5/+0
|
* Just very so slightly better test coverageGodfrey Chan2014-02-111-15/+57
|
* Renamed session_serializer option to cookies_serializerGodfrey Chan2014-02-111-6/+6
|
* docs, link to HTTP and CGI header definitions. [ci skip]Yves Senn2014-02-101-1/+1
| | | | This was a reaction to: https://github.com/rails/rails/pull/9700#issuecomment-34550210
* Set the :shallow_path as each scope is generatedAndrew White2014-02-091-0/+75
| | | | | | | | | | | | | | | | If we set :shallow_path when shallow is called it can result in incorrect paths if the resource is inside a namespace because namespace itself sets the :shallow_path option to the namespace path. We fix this by removing the :shallow_path option from shallow as that should only be turning shallow routes on and not otherwise affecting the scope. To do this we need to treat the :shallow option to resources differently to other scope options and move it to before the nested block is called. This change also has the positive side effect of making the behavior of the :shallow option consistent with the shallow method. Fixes #12498.
* Merge pull request #13982 from dskang/fix-response-flatten-infinite-recursionAaron Patterson2014-02-091-0/+18
|\ | | | | Fix response flatten infinite recursion
| * Prevent [response].flatten from recursing infinitely.Dan Kang2014-02-081-0/+9
| | | | | | | | | | | | Returning `self` from within the array returned by `to_ary` caused this. Instead, we can just substitute another object. It provides the `each` behavior required by the rack spec.
| * Add missing test for response destructuring.Myron Marston2014-02-081-0/+9
| |
* | Merge pull request #13985 from zzak/remove_old_todo_in_url_for_testCarlos Antonio da Silva2014-02-091-3/+0
|\ \ | | | | | | Remove outdated TODO from url_for test, this test was fixed in 900a2d30
| * | Remove outdated TODO from url_for test, this test was fixed in 900a2d30Zachary Scott2014-02-091-3/+0
| |/
* | use File.exist? instead of File.exists?SHIBATA Hiroshi2014-02-091-1/+1
| |
* | Skips tests on Windows that create files with illegal charactersMikko Johansson2014-02-091-2/+7
|/
* Tests that skips a controller filters that was set up using a classIonatan Wiznia2014-02-061-0/+16
|
* Merge pull request #13863 from joshjordan/jsj-dont-throw-out-get-paramsRafael Mendonça França2014-02-011-0/+20
|\ | | | | | | | | | | | | Do not discard query parameters on requests that use wrap_parameters Conflicts: actionpack/CHANGELOG.md
| * Do not discard query parameters on requests that use wrap_parametersJosh Jordan2014-01-301-0/+20
| |
* | Modify the session serializer implementationGuillermo Iguaran2014-01-301-9/+3
| | | | | | | | | | Rename allowed options to :marshal and :json, for custom serializers only allow the use of custom classes.
* | Allow session serializer key in config.session_storeLukasz Sarnacki2014-01-291-0/+33
|/ | | | | | | | | | | | | MessageEncryptor has :serializer option, where any serializer object can be passed. This commit make it possible to set this serializer from configuration level. There are predefined serializers (:marshal_serializer, :json_serialzier) and custom serializer can be passed as String, Symbol (camelized and constantized in ActionDispatch::Session namepspace) or serializer object. Default :json_serializer was also added to generators to provide secure defalt.
* Clear filtered request attributes between requests in testsAndrew White2014-01-272-0/+19
| | | | | | | | The request attributes filtered_parameters, filtered_env and filtered_path are memoized for performance reasons. However this can cause unusual behavior in tests where there are multiple calls to get, post, etc. Fixes #13803.
* Add additional tests for #13824Andrew White2014-01-251-0/+26
|
* Transform dashes to underscores in resource route namesByron Bischoff2014-01-251-3/+13
| | | | Fixes #13824
* Remove unused argument.Francesco Rodriguez2014-01-241-1/+1
|