aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
Commit message (Collapse)AuthorAgeFilesLines
* stop passing recall to url_forAaron Patterson2014-07-152-37/+48
|
* fix warningsAaron Patterson2014-07-151-1/+1
|
* stop calling url_for with recall parameters and actually use a requestAaron Patterson2014-07-152-85/+197
|
* execute a request and check the path_parametersAaron Patterson2014-07-151-17/+59
| | | | | | | | This actually runs a request through the system, using the actual routing methods as we would use in production, then tests the path_parameters set on the request object. The `recognize_path` method isn't actually used in production, so testing what it returns isn't useful.
* set `set` in the setup methodAaron Patterson2014-07-151-2/+5
|
* remove useless ivar setAaron Patterson2014-07-151-1/+0
|
* RouteSet should be in charge of constructing the dispatherAaron Patterson2014-07-151-2/+2
| | | | Now we can override how requests are dispatched in the routeset object
* Merge pull request #16168 from greysteil/stash-path-infoMatthew Draper2014-07-141-1/+2
|\ | | | | Stash original path in `ShowExceptions` middleware
| * Stash original path in `ShowExceptions` middlewareGrey Baker2014-07-141-1/+2
| | | | | | | | | | | | | | | | | | | | `ActionDispatch::ShowExceptions` overwrites `PATH_INFO` with the status code for the exception defined in `ExceptionWrapper`, so the path the user was visiting when an exception occurred was not previously available to any custom exceptions_app. The original `PATH_INFO` is now stashed in `env["action_dispatch.original_path"]`.
* | Fix typos like `a html` to `an html` and 'an mail' to 'an email'. [ci skip]Santosh Wadghule2014-07-141-2/+2
|/
* Removed single space padding from empty response body.Godfrey Chan2014-07-104-16/+16
| | | | | | | | | | | | `render nothing: true` or rendering a `nil` body no longer add a single space to the response body. The old behavior was added as a workaround for a bug in an early version of Safari, where the HTTP headers are not returned correctly if the response body has a 0-length. This is been fixed since and the workaround is no longer necessary. Use `render body: ' '` if the old behavior is desired.
* Merge branch 'rosetta_flash' of https://github.com/gcampbell/rails into ↵Aaron Patterson2014-07-102-2/+2
|\ | | | | | | | | | | | | | | | | | | gcampbell-rosetta_flash * 'rosetta_flash' of https://github.com/gcampbell/rails: Address CVE-2014-4671 (JSONP Flash exploit) Conflicts: actionpack/CHANGELOG.md
| * Address CVE-2014-4671 (JSONP Flash exploit)Greg Campbell2014-07-092-2/+2
| | | | | | | | | | | | Adds a comment before JSONP callbacks. See http://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/ for more details on the exploit in question.
* | Force encoding of US-ASCII to UTF-8 in unescape_uri.Karl Entwistle2014-07-101-0/+5
|/ | | | | | | | | Because URI paths may contain non US-ASCII characters we need to force the encoding of any unescaped URIs to UTF-8 if they are US-ASCII. This essentially replicates the functionality of the monkey patch to URI.parser.unescape in active_support/core_ext/uri.rb. Fixes #16104.
* Merge pull request #13999 from jamox/update_rackAaron Patterson2014-07-082-7/+17
|\ | | | | This updates rails to use edge rack
| * Upgraded rackJarmo Isotalo2014-05-192-7/+17
| | | | | | | | | | | | | | | | As Rack has some non backwards compatible changes added required modifications to keep behaviour in rails close to same as before. Also modified generators to include rack/rack for not yet released version of rack
* | always test against a routed rack app so there are always url_helpersAaron Patterson2014-07-074-35/+65
| |
* | Generate shallow paths for all children of shallow resources.Seb Jacobs2014-07-061-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit shallow resources would only generate paths for non-direct children (with a nested depth greater than 1). Take the following routes file. resources :blogs do resources :posts, shallow: true do resources :comments do resources :tags end end end This would generate shallow paths for `tags` nested under `posts`, e.g `/posts/:id/tags/`, however it would not generate shallow paths for `comments` nested under `posts`, e.g `/posts/:id/comments/new`. This commit changes the behaviour of the route mapper so that it generate paths for direct children of shallow resources, for example if you take the previous routes file, this will now generate shallow paths for `comments` nested under `posts`, .e.g `posts/:id/comments/new`. This was the behaviour in Rails `4.0.4` however this was broken in @jcoglan's fix for another routes related issue[1]. This also fixes an issue[2] reported by @smdern. [1] https://github.com/rails/rails/commit/d0e5963 [2] https://github.com/rails/rails/issues/15783
* | Merge pull request #16013 from tgxworld/remove_symbolized_path_parametersRafael Mendonça França2014-07-042-5/+5
|\ \ | | | | | | Remove symbolized_path_parameters.
| * | Remove symbolized_path_parameters.Guo Xiang Tan2014-07-022-5/+5
| | | | | | | | | | | | This pull request is a continuation of https://github.com/rails/rails/commit/925bd975 and https://github.com/rails/rails/commit/8d8ebe3d.
* | | Merge pull request #16011 from xjlu/token_and_optionsRafael Mendonça França2014-07-041-2/+22
|\ \ \ | | | | | | | | Improve token_and_options regex and test
| * | | Improve token_and_options regex and testXinjiang Lu2014-07-011-2/+22
| | | | | | | | | | | | | | | | add a test case to test the regex for the helper method raw_params
* | | | Change the JSON renderer to enforce the 'JS' Content TypeLucas Mazza2014-07-021-0/+13
| |/ / |/| | | | | | | | | | | | | | | | | The controller can set the response format as 'JSON' before the renderer code be evaluated, so we must replace it when necessary. Fixes #15081
* | | Fix typoRafael Mendonça França2014-07-021-1/+1
|/ /
* | Merge pull request #15933 from rafael/masterRafael Mendonça França2014-06-271-0/+29
|\ \ | | | | | | | | | | | | | | | Add always permitted parameters as a configurable option. [Rafael Mendonça França + Gary S. Weaver]
| * | Improvements per code review.Rafael Chacón2014-06-271-0/+29
| | | | | | | | | | | | | | | | | | * General style fixes. * Add changes to configuration guide. * Add missing tests.
* | | Merge pull request #15537 from tgxworld/fix_state_leakMatthew Draper2014-06-203-4/+5
|\ \ \ | | | | | | | | Fix state leak.
| * | | Remove redundant code.Guo Xiang Tan2014-06-051-4/+0
| | | |
| * | | Prevent state leak.Guo Xiang Tan2014-06-053-0/+5
| | | |
* | | | Fix request's path_info when a rack app mounted at '/'.Larry Lv2014-06-141-0/+7
| | | | | | | | | | | | | | | | Fixes issue #15511.
* | | | Merge pull request #15692 from sromano/falseClassMatthew Draper2014-06-141-1/+17
|\ \ \ \ | | | | | | | | | | | | | | | ActionController::Parameters#require now accepts FalseClass values
| * | | | ActionController::Parameters#require now accepts FalseClass valuesSergio Romano2014-06-131-1/+17
|/ / / / | | | | | | | | | | | | Fixes #15685.
* | | | Fix parsed token value with header `Authorization token=`.Larry Lv2014-06-131-6/+23
| | | |
* | | | use Ruby for mockingAaron Patterson2014-06-121-1/+1
| | | |
* | | | remove warningsKuldeep Aggarwal2014-06-122-3/+0
| | | | | | | | | | | | | | | | warning: assigned but unused variable - scope_called, path and strexp
* | | | Merge pull request #15545 from zuhao/refactor_actionpack_assert_select_testYves Senn2014-06-081-1/+4
|\ \ \ \ | | | | | | | | | | Restore test deliveries for ActionMailer.
| * | | | Restore test deliveries for ActionMailer.Zuhao Wan2014-06-071-1/+4
| |/ / /
* | | | Handle client disconnect during live streamingMatthew Draper2014-06-081-0/+89
| | | | | | | | | | | | | | | | .. even when the producer is blocked for a write.
* | | | adds some details to the rationale of converted_arrays [ci skip]Xavier Noria2014-06-071-1/+1
| | | |
* | | | adds a regression test for the strong params converted arrays cacheXavier Noria2014-06-071-1/+18
| | | | | | | | | | | | | | | | This is a regression test for 29844dd.
* | | | Revert "Convert StrongParameters cache to a hash. This fixes an unbounded"Xavier Noria2014-06-071-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot cache keys because arrays are mutable. We rather want to cache the arrays. This behaviour is tailor-made for the usage pattern strongs params is designed for. In a forthcoming commit I am going to add a test that covers why we need to cache by value. Every strong params instance has a live span of a request, the cache goes away with the object. Since strong params have such a concrete intention, it would be interesting to see if there are actually any real-world use cases that are an actual leak, one that practically may matter. I am not convinced that the theoretical leak has any practical consequences, but if it can be shown there are, then I believe we should either get rid of the cache (which is an optimization), or else wipe it in the mutating API. This reverts commit e63be2769c039e4e9ada523a8497ce3206cc8a9b.
* | | Merge pull request #15530 from zuhao/refactor_actionpack_reloader_testMatthew Draper2014-06-061-0/+5
|\ \ \ | | | | | | | | Reset callbacks after test.
| * | | Reset callbacks after test.Zuhao Wan2014-06-051-0/+5
| | | | | | | | | | | | | | | | Otherwise the state of callback chain is leaked.
* | | | Merge pull request #15532 from zuhao/refactor_actionpack_response_testYves Senn2014-06-051-2/+4
|\ \ \ \ | | | | | | | | | | Restore Response.default_headers after test.
| * | | | Restore Response.default_headers after test.Zuhao Wan2014-06-051-2/+4
| | | | |
* | | | | Avoid hard-coded value in test setup/teardown.Zuhao Wan2014-06-051-1/+2
|/ / / /
* | | | Merge pull request #15529 from zuhao/refactor_actionpack_mime_type_testYves Senn2014-06-052-8/+0
|\ \ \ \ | |/ / / |/| | | Make sure Mime::Type is not altered after tests.
| * | | Mime::PNG is already defined.Zuhao Wan2014-06-052-8/+0
| | | |
* | | | Avoid hardcoded value in test setup/teardown.Zuhao Wan2014-06-051-1/+2
|/ / /
* | | Merge pull request #15498 from zenspider/fix_memory_leakGuillermo Iguaran2014-06-031-1/+1
|\ \ \ | | | | | | | | Convert StrongParameters cache to a hash. This fixes an unbounded memory leak