Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15061 from tgxworld/remove_unnecessary_include | Matthew Draper | 2014-05-29 | 1 | -1/+0 |
|\ | | | | | Remove unnecessary include for integration tests. | ||||
| * | Remove unnecessary include for integration tests. | Guo Xiang Tan | 2014-05-11 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #15399 from tgxworld/remove_todo_router_test | Guillermo Iguaran | 2014-05-28 | 1 | -11/+1 |
|\ \ | | | | | | | Remove TODO. | ||||
| * | | Remove TODO. | Guo Xiang Tan | 2014-05-28 | 1 | -11/+1 |
| | | | |||||
* | | | Merge pull request #15384 from zuhao/refactor_actionpack_params_wrapper_test | Yves Senn | 2014-05-29 | 1 | -7/+19 |
|\ \ \ | | | | | | | | | Clear inflections after test. | ||||
| * | | | Clear inflections after test. | Zuhao Wan | 2014-05-28 | 1 | -7/+19 |
| | | | | |||||
* | | | | add tests for argument error cases | Aaron Patterson | 2014-05-28 | 1 | -0/+27 |
| | | | | |||||
* | | | | Merge pull request #15386 from ↵ | Santiago Pastorino | 2014-05-28 | 1 | -3/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | zuhao/refactor_actionpack_request_forgery_protection_test Avoid hardcoded `request_forgery_protection_token` value in teardown. | ||||
| * | | | | Avoid hardcoded value in teardown. | Zuhao Wan | 2014-05-28 | 1 | -3/+6 |
| | | | | | |||||
* | | | | | Merge pull request #15388 from zuhao/refactor_actionpack_send_file_test | Santiago Pastorino | 2014-05-28 | 1 | -2/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Unregister Mime::Type in teardown. | ||||
| * | | | | | Unregister Mime::Type in teardown. | Zuhao Wan | 2014-05-28 | 1 | -2/+6 |
| |/ / / / | |||||
* | | | | | Merge pull request #15385 from zuhao/refactor_actionpack_render_other_test | Santiago Pastorino | 2014-05-28 | 1 | -4/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add and remove renderer inside the test to prevent leak. | ||||
| * | | | | Add and remove renderer inside the test to prevent leak. | Zuhao Wan | 2014-05-28 | 1 | -4/+7 |
| |/ / / | |||||
* | | | | Merge pull request #15383 from ↵ | Yves Senn | 2014-05-28 | 1 | -10/+8 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | zuhao/refactor_actionpack_localized_templates_test Move I18n.locale setting into setup and teardown. | ||||
| * | | | Move I18n.locale setting into setup and teardown. | Zuhao Wan | 2014-05-28 | 1 | -10/+8 |
| |/ / | |||||
* / / | Add with_default_charset helper. | Zuhao Wan | 2014-05-28 | 1 | -12/+20 |
|/ / | |||||
* | | Deprecate all *_filter callbacks in favor of *_action callbacks | Rafael Mendonça França | 2014-05-27 | 3 | -194/+196 |
| | | | | | | | | | | This is the continuation of the work started at 9d62e04838f01f5589fa50b0baa480d60c815e2c | ||||
* | | PARAMETERS_KEY is only used in the request, so move the constant there | Aaron Patterson | 2014-05-27 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'constraints' | Aaron Patterson | 2014-05-27 | 1 | -2/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * constraints: rm reset_parameters because we automatically do it from 9ca4839a move path_parameter encoding check to the request object dispatcher doesn't need `call` anymore call `serve` with the request on dispatchers constraints class does not need the request class anymore give all endpoints a superclass skip the build business if the stack is empty stop hardcoding path_parameters and get it from the request we do not need to cache rack_app a redirect is not a dispatcher by definition, so eliminate test push is_a check up to where the Constraints object is allocated pass the request object to the application pass a request to `matches?` so we can avoid creating excess requests nothing is passed to `rack_app` anymore, so rm the params one fewer is_a check Constraints#app should never return another Constraints object, so switch to if statement eliminate dispatcher is_a checks push is_a?(Dispatcher) check in to one place Always construct route objects with Constraint objects Conflicts: actionpack/lib/action_controller/metal.rb | ||||
| * | | rm reset_parameters because we automatically do it from 9ca4839a | Aaron Patterson | 2014-05-27 | 1 | -3/+0 |
| | | | |||||
| * | | pass the request object to the application | Aaron Patterson | 2014-05-25 | 1 | -2/+5 |
| | | | |||||
| * | | push is_a?(Dispatcher) check in to one place | Aaron Patterson | 2014-05-24 | 1 | -0/+1 |
| | | | |||||
| * | | Always construct route objects with Constraint objects | Aaron Patterson | 2014-05-24 | 1 | -0/+3 |
| | | | |||||
* | | | Skip individual tests upon Dalli::RingError | Matthew Draper | 2014-05-27 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | Unlike the outer `rescue`, this one is much more precise about what we want to handle: a connection failure (`Dalli::RingError`) is not relevant to what we're testing here. But other Dalli errors may well be indicating an actual problem. | ||||
* | | | The correct status to test should be :switching_protocols. | Zuhao Wan | 2014-05-25 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #14986 from dlangevin/trailing-slash-url-generation | Rafael Mendonça França | 2014-05-24 | 1 | -0/+18 |
|\ \ | | | | | | | | | | | | | | | | | | | Fixes URL generation with trailing_slash: true Conflicts: actionpack/lib/action_dispatch/http/url.rb | ||||
| * | | Fixes URL generation with trailing_slash: true | Dan Langevin | 2014-05-22 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | URL generation with trailing_slash: true was adding a trailing slash after .:format Routes.draw do resources :bars end bars_url(trailing_slash: true, format: 'json') # => /bars.json/ This commit removes that extra trailing slash | ||||
* | | | glob_param is never used, so rm | Aaron Patterson | 2014-05-23 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | this also changes the constructor. We don't need to pass more options than "defaults" (whatever defaults are, ugh. probably another hash of stupid stuff). | ||||
* | | | decouple the router object from the request class | Aaron Patterson | 2014-05-23 | 1 | -14/+6 |
| | | | |||||
* | | | pass the correct custom request to the recognize method | Aaron Patterson | 2014-05-23 | 1 | -13/+10 |
| | | | |||||
* | | | switch to the `serve` method so we can remove the request class (eventually) | Aaron Patterson | 2014-05-23 | 1 | -2/+6 |
| | | | |||||
* | | | extract request allocation from the main app serving routine | Aaron Patterson | 2014-05-23 | 1 | -0/+1 |
| | | | |||||
* | | | remove NullRequest and just always pass a request class | Aaron Patterson | 2014-05-23 | 1 | -3/+7 |
| | | | |||||
* | | | use the request object since we have it | Aaron Patterson | 2014-05-23 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | stop hardcoding hash keys and use the accessors provided on the request object. | ||||
* | | | stop using PARAMETERS_KEY, and use the accessor on the request object | Aaron Patterson | 2014-05-22 | 1 | -0/+3 |
| | | | | | | | | | | | | this decouples our code from the env hash a bit. | ||||
* | | | use symbol keys for path_parameters | Aaron Patterson | 2014-05-22 | 1 | -5/+5 |
| | | | |||||
* | | | Form full URI as string to be parsed in Rack::Test. | Guo Xiang Tan | 2014-05-21 | 1 | -6/+6 |
| | | | | | | | | | | | | There are performance gains to be made by avoiding URI setter methods. | ||||
* | | | middle variable is never used, so rm | Aaron Patterson | 2014-05-21 | 1 | -14/+14 |
| | | | |||||
* | | | we don't use this parameter for anything, so rm | Aaron Patterson | 2014-05-20 | 1 | -20/+19 |
| | | | |||||
* | | | Merge pull request #11346 from tomykaira/fix_10257 | Rafael Mendonça França | 2014-05-20 | 1 | -0/+7 |
|\ \ \ | | | | | | | | | Check authentication scheme in Basic auth | ||||
| * | | | Check authentication scheme in Basic auth | tomykaira | 2013-07-07 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `authenticate_with_http_basic` and its families should check the authentication schema is "Basic". Different schema, such as OAuth2 Bearer should be rejected by basic auth, but it was passing as the test shows. This fixes #10257. | ||||
* | | | | Merge pull request #15182 from zuhao/refactor_actionpack_respond_with_test_2 | Yves Senn | 2014-05-20 | 1 | -4/+10 |
|\ \ \ \ | | | | | | | | | | | Un-define :to_json for Customer class after stubbing. | ||||
| * | | | | Add using_resouce_with_json to controller. | Zuhao Wan | 2014-05-20 | 1 | -4/+10 |
| | | | | | |||||
* | | | | | Merge pull request #15178 from zuhao/refactor_actionpack_respond_with_test | Yves Senn | 2014-05-20 | 1 | -0/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | Deregister csv renderer after test to prevent leak. | ||||
| * | | | | | Add ActionController::Renderers.remove. | Zuhao Wan | 2014-05-20 | 1 | -0/+19 |
| |/ / / / | |||||
* / / / / | Revert "Rewrite journey routes formatter for performance" | Aaron Patterson | 2014-05-19 | 1 | -0/+20 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5c224de9e110763ec7a0f01f5b604bcf81f40bfb. Conflicts: actionpack/lib/action_dispatch/journey/visitors.rb 5c224de9e110763ec7a0f01f5b604bcf81f40bfb introduced a bug in the formatter. This commit includes a regression test. | ||||
* | | | | Ensure :js is defined regardless of the outcome of the test. | Zuhao Wan | 2014-05-17 | 1 | -5/+11 |
| | | | | |||||
* | | | | fixes stack level too deep exception on action named 'status' returning ↵ | Christiaan Van den Poel | 2014-05-15 | 1 | -0/+31 |
| | | | | | | | | | | | | | | | | 'head :ok' | ||||
* | | | | Add RFC4791 MKCALENDAR method | kasper | 2014-05-15 | 1 | -2/+3 |
| | | | | |||||
* | | | | Remove unused method in RouteSet test. | Guo Xiang Tan | 2014-05-15 | 1 | -4/+0 |
| | | | |