Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refine tests for assert_select failure messages | Marcus Stollsteimer | 2014-04-14 | 1 | -11/+13 |
| | |||||
* | Remove surplus period from assertion messages | Marcus Stollsteimer | 2014-04-13 | 1 | -3/+3 |
| | |||||
* | Add CHANGELOG entry for #14619 [ci skip] | Rafael Mendonça França | 2014-04-11 | 1 | -0/+4 |
| | |||||
* | Merge pull request #14619 from winston/enhance-routing-error-html | Rafael Mendonça França | 2014-04-11 | 1 | -63/+119 |
|\ | | | | | | | Enhance routing error html page | ||||
| * | Split search results into 'exact matches' and 'fuzzy matches'. | Winston | 2014-04-11 | 1 | -60/+96 |
| | | | | | | | | - also refactored the javascript. | ||||
| * | Improve CSS styling for routing error html page. | Winston | 2014-04-11 | 1 | -7/+25 |
| | | |||||
| * | Implement fuzzy matching for route search on routing error html page. | Winston | 2014-04-11 | 1 | -8/+10 |
| | | |||||
* | | Only make deeply nested routes shallow when parent is shallow | Andrew White | 2014-04-11 | 2 | -3/+22 |
| | | | | | | | | | | | | | | | | | | | | Since `:shallow` may be set at any point in the resource nesting we should only make the new and collection routes shallow when the parent is shallow. This is a bit of a hack but until the mapper is refactored to an object graph instead of a hash of merged values it's the best we can do. Fixes #14684. | ||||
* | | Add a failing test for a URL helper that was broken by a6b9ea2. | James Coglan | 2014-04-10 | 1 | -0/+18 |
|/ | |||||
* | Avoid URI parsing | Andriel Nuernberg | 2014-04-09 | 2 | -5/+15 |
| | | | | | This parsing is unecessary once the Request object already has the needed information. | ||||
* | Remove unused `subclass_controller_with_flash_type_bar` var from flash test. | Vipul A M | 2014-04-07 | 1 | -2/+2 |
| | |||||
* | Fix setup of adding _flash_types test. | Guo Xiang Tan | 2014-04-06 | 1 | -6/+15 |
| | | | | | | | Adding flash types to a controller within any of the tests will result in a global state change of the controller under test. This patch will prevent state leaks and allow us to run the test in random order. | ||||
* | push move_string in to `move` | Aaron Patterson | 2014-04-01 | 1 | -14/+12 |
| | |||||
* | combine move_regexp and move_string so we only loop over states once | Aaron Patterson | 2014-04-01 | 1 | -9/+6 |
| | |||||
* | do not create memo objects since we'll just throw them away | Aaron Patterson | 2014-04-01 | 2 | -9/+11 |
| | |||||
* | only ask if `t` is empty once. | Aaron Patterson | 2014-04-01 | 1 | -4/+1 |
| | |||||
* | Tiny doc fix for Strong Parameters | Ian C. Anderson | 2014-03-30 | 1 | -1/+1 |
| | | | - accepts_nested_attribute_for -> accepts_nested_attributes_for | ||||
* | Merge pull request #13890 from achempion/syntax-error-backtrace | Yves Senn | 2014-03-29 | 3 | -0/+47 |
|\ | | | | | append link to bad code when error type is SyntaxError | ||||
| * | Append link to bad code to backtrace when exception is SyntaxError | Boris Kuznetsov | 2014-03-27 | 3 | -0/+47 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-03-29 | 1 | -0/+4 |
|\ \ | |||||
| * | | Mention required glob param name in match docs for mapper | Earl St Sauver | 2014-03-20 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | THe match documentation doesn't mention any requirement of the parameter name requirement for matches. However, including a bare glob character without a variable assignment causes a parse error. | ||||
* | | | Replace trivial regexp with string or index, twice as fast | Kelley Reynolds | 2014-03-28 | 2 | -2/+2 |
| |/ |/| | |||||
* | | update comments to reflect that options support is not available | Frederick Cheung | 2014-03-25 | 1 | -2/+2 |
| | | |||||
* | | Swapped parameters of assert_equal in assert_select | Vishal Lal | 2014-03-22 | 2 | -1/+8 |
| | | |||||
* | | Update test helper to use latest Digestor API | David Heinemeier Hansson | 2014-03-21 | 1 | -8/+8 |
| | | |||||
* | | The digest option is no longer honoured since Rails 3.0 [ci skip] | Godfrey Chan | 2014-03-20 | 1 | -1/+1 |
| | | | | | | | | Closes #8513 | ||||
* | | Cleaning and adding tests for Session | Attila Domokos | 2014-03-19 | 1 | -7/+34 |
| | | | | | | Adding tests for Session `destroy`, `update` and `delete` methods. No changes for code under test. | ||||
* | | Merge pull request #14090 from ↵ | Aaron Patterson | 2014-03-17 | 2 | -10/+30 |
|\ \ | | | | | | | | | | | | | Fortisque/kevin/stream_error_in_main_thread_if_not_committed re-raise error if error occurs before committing in streaming | ||||
| * | | re-raise error if error occurs before committing in streaming | Kevin Casey | 2014-03-14 | 2 | -10/+30 |
| | | | | | | | | | | | | update the tests, using an if-else | ||||
* | | | Add an explicit require for 4ece124396669d3580e7f229ab407a0d4882727a rather ↵ | Jeremy Kemper | 2014-03-16 | 1 | -0/+1 |
| | | | | | | | | | | | | than assume SecureRandom is available | ||||
* | | | Avoid concurrent test collision on the same memcache server by namespacing keys | Jeremy Kemper | 2014-03-16 | 1 | -1/+1 |
| | | | |||||
* | | | Use nested_scope? not shallow? to determine whether to copy options | Andrew White | 2014-03-16 | 3 | -1/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | The method `shallow?` returns false if the parent resource is a singleton so we need to check if we're not inside a nested scope before copying the :path and :as options to their shallow equivalents. Fixes #14388. | ||||
* | | | Merge pull request #14329 from pch/digestor-lookup-fix | Rafael Mendonça França | 2014-03-14 | 2 | -0/+24 |
|\ \ \ | |/ / |/| | | | | | Ensure LookupContext in Digestor selects correct variant | ||||
| * | | Don't pass variant in params, it's ignored | Łukasz Strzałkowski | 2014-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | We're setting variant above, in request object directly | ||||
| * | | Ensure LookupContext in Digestor selects correct variant | Piotr Chmolowski | 2014-03-09 | 2 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to: #14242 #14243 14293 Variants passed to LookupContext#find() seem to be ignored, so I've used the setter instead: `finder.variants = [ variant ]`. I've also added some more test cases for variants. Hopefully this time passing tests will mean it actually works. | ||||
* | | | use the body proxy to freeze headers | Aaron Patterson | 2014-03-12 | 5 | -12/+57 |
| | | | | | | | | | | | | | | | | | | avoid freezing the headers until the web server has actually read data from the body proxy. Once the webserver has read data, then we should throw an error if someone tries to set a header | ||||
* | | | just ask the response for the commit status, we do not need to ask the jar | Aaron Patterson | 2014-03-12 | 1 | -1/+1 |
| | | | |||||
* | | | only write the jar if the response isn't committed | Aaron Patterson | 2014-03-12 | 6 | -10/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when streaming responses, we need to make sure the cookie jar is written to the headers before returning up the stack. This commit introduces a new method on the response object that writes the cookie jar to the headers as the response is committed. The middleware and test framework will not write the cookie headers if the response has already been committed. fixes #14352 | ||||
* | | | Merge pull request #14291 from laurocaetano/doc-for-original-fullpath | Yves Senn | 2014-03-12 | 1 | -0/+7 |
|\ \ \ | | | | | | | | | Add documentation for original_fullpath. [ci skip] | ||||
| * | | | [ci skip] Add documentation for original_fullpath. | Lauro Caetano | 2014-03-11 | 1 | -0/+7 |
| | | | | |||||
* | | | | Merge pull request #14262 from sferik/flat_map | Andrew White | 2014-03-09 | 7 | -18/+18 |
|\ \ \ \ | |_|/ / |/| | | | Replace additional instances of map.flatten with flat_map | ||||
| * | | | Replace map.flatten with flat_map in actionpack | Erik Michaels-Ober | 2014-03-03 | 7 | -18/+18 |
| | | | | |||||
* | | | | Move changelog entry to the top, highlight module name [ci skip] | Carlos Antonio da Silva | 2014-03-08 | 1 | -5/+6 |
| | | | | |||||
* | | | | Copy shallow options from normal options when using scope | Andrew White | 2014-03-08 | 2 | -1/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 hash | Andrew White | 2014-03-08 | 2 | -3/+140 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 > 1 | Andrew White | 2014-03-08 | 2 | -20/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Move setting :scope_level_resource to resource_scope | Andrew White | 2014-03-08 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally with_scope_level was exclusively for managing scope levels with resources, however it is now used for other things so it makes more sense to move the responsibility for setting the :scope_level_resource to the resource_scope method. This eliminates repeatedly setting it to the same resource as each resource method scope is evaluated. | ||||
* | | | | Merge pull request #14280 from joho/make_csrf_failure_logging_optional | Santiago Pastorino | 2014-03-08 | 3 | -1/+28 |
|\ \ \ \ | |_|_|/ |/| | | | Make CSRF failure logging optional/configurable. | ||||
| * | | | Make CSRF failure logging optional/configurable. | John Barton (joho) | 2014-03-05 | 3 | -1/+28 |
| | | | | | | | | | | | | | | | | | | | | Added the log_warning_on_csrf_failure option to ActionController::RequestForgeryProtection which is on by default. | ||||
* | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-03-07 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/4_1_release_notes.md |