aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-11-151-5/+5
|\
| * adding missing `.` Gaurav Sharma2015-11-151-5/+5
| |
* | [ci skip] Fix <tt> in docclaudiob2015-11-151-1/+1
| |
* | Merge pull request #22277 from jwworth/pull-request/fix-typo-1447344392Rafael França2015-11-121-1/+1
|\ \ | | | | | | Fix typo [ci skip]
| * | Fix typo [ci skip]Jake Worth2015-11-121-1/+1
| | |
* | | Merge pull request #22259 from daisuko/remove_compiled_root_from_static_rbYves Senn2015-11-121-1/+0
|\ \ \ | |/ / |/| | remove unnecessary @compiled_root from static.rb
| * | remove unnecessary @compiled_root from static.rbdaisuko2015-11-111-1/+0
| | |
* | | Show middleware classes on /rails/info/propertiesclaudiob2015-11-111-1/+5
|/ / | | | | | | | | | | | | Closes #21230 by following the indication of @rafaelfranca: > I think the output change would be simpler. > What is really important to show is the class of the middleware, so we should change the output to show that.
* | Require only necessary concurrent-ruby classes.Jerry D'Antonio2015-11-042-2/+2
| |
* | tests, test should not care wether 9ms or 11ms have passed.Yves Senn2015-11-041-1/+1
| | | | | | | | | | | | | | | | This solves: ``` Expected /Completed 200 OK in [\d]ms/ to match "Completed 200 OK in 943ms". ```
* | Move `static_cache_contorl` deprecation changelog entry to Railties.Kasper Timm Hansen2015-11-041-5/+0
| | | | | | | | | | | | | | The configuration for `config.static_cache_control`, and its replacement `config.public_file_server.headers` are implemented in Railties. People would configure this in environment files, which is Railties domain too.
* | Deprecate exception#original_exception in favor of exception#causeYuki Nishijima2015-11-0314-42/+85
| |
* | remove present? call; we do not need itAaron Patterson2015-11-021-1/+1
| |
* | Fix double word 'string' [ci skip]Jake Worth2015-11-011-1/+1
|/
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-10-313-13/+13
|\
| * Improved readability of Assertion docs, replaced ‘Assert’ -> ↵amitkumarsuroliya2015-10-093-12/+12
| | | | | | | | | | ‘Asserts’ at all places [ci skip] Following commit https://github.com/rails/docrails/commit/495722a95687e25114ae75608dd3107ac5d6611b
| * Fixed wording in Assertion docs, changed ‘Assert’ -> ‘Asserts’Ronak Jangir2015-10-071-1/+1
| |
* | Merge pull request #21251 from rodzyn/more_param_parser_testsSean Griffin2015-10-301-0/+14
|\ \ | | | | | | Add test for parsing application/vnd.api+json
| * | Add test for parsing application/vnd.api+jsonMarcin Olichwirowicz2015-08-211-0/+14
| | |
* | | Revert "ActionController::Base#process() now only takes an action name"Aaron Patterson2015-10-293-6/+22
| | | | | | | | | | | | This reverts commit 9f93a5efbba3e1cbf0bfa700a17ec8d1ef60d7c6.
* | | ActionController::Base#process() now only takes an action nameAaron Patterson2015-10-293-22/+6
| | | | | | | | | | | | | | | | | | rather than an action name and *args. The *args were not being used in regular applications outside tests. This causes a backwards compatibility issue, but reduces array allocations for most users.
* | | switch to JSON.dump to avoid infinite recursionAaron Patterson2015-10-291-1/+1
| | |
* | | use `dispatch` instead of `process` to run requests thougheileencodes2015-10-292-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | `dispatch` sets the request and response on the controller for us automatically, so the test harness doesn't need to know the internals of how request / response is set. Conflicts: actionpack/lib/action_controller/test_case.rb
* | | Remove unnecessary methodeileencodes2015-10-291-3/+0
| | |
* | | specify deprecated waring, follow the standard conventionsGaurav Sharma2015-10-282-6/+6
| | | | | | | | | | | | `skip_filter`, `skip_action_callback` may both are deprecated in Rails 5.1 so waring msg should be specific.
* | | Write the cookie jar it was not committed in TestCaseRafael Mendonça França2015-10-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For ActionController::Base we write the cookies in a middleware if it was not yet committed no matter if the response was committed or not. [1] For ActionController::Live we write the cookies before the response is committed. [2] We already mimic ActionController::Live in ActionController::TestCase but we don't mimic the ActionController::Base behavior because we were checking if the response was committed before writing the cookies. Now we are matching the behavior of the middleware and writing the cookies if it was not written before. [1]: https://github.com/rails/rails/blob/80c6b901d4d87cee610ab0a438ff6e3c6bf118d1/actionpack/lib/action_dispatch/middleware/cookies.rb#L599-L604 [2]: https://github.com/rails/rails/blob/80c6b901d4d87cee610ab0a438ff6e3c6bf118d1/actionpack/lib/action_controller/metal/live.rb#L218-L223
* | | Remove dead codeRafael Mendonça França2015-10-281-5/+0
| | | | | | | | | | | | This is leftover from when `render nothing: true` rendered blank string.
* | | Remove skipped JRuby tests that are passing on 9.0.3.0.Guo Xiang Tan2015-10-273-6/+0
| | |
* | | Merge pull request #22060 from sebmck/tweak-wordingClaudio B2015-10-251-2/+2
|\ \ \ | | | | | | | | Tweaked wording used in some tests.
| * | | Tweaked wording used in some tests.Sebastian McKenzie2015-10-251-2/+2
| | | |
* | | | fix rdoc markup [ci skip]yuuji.yaginuma2015-10-251-4/+4
|/ / /
* | | Remove skip on tests that have been fixed.Guo Xiang Tan2015-10-241-4/+0
| | |
* | | Catch invalid UTF-8 querystring values and respond with BadRequestGrey Baker2015-10-234-7/+37
| | |
* | | FIX: Randomly failing test when running without GIL.Guo Xiang Tan2015-10-231-0/+6
| | |
* | | Merge pull request #22029 from yui-knk/fixup_content_type_regexpRafael Mendonça França2015-10-221-1/+1
|\ \ \ | | | | | | | | Use sufficient a regexp anchor to check `@response.content_type.to_s`
| * | | Use sufficient a regexp anchor to check `@response.content_type.to_s`yui-knk2015-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This commit follows up of ea9bc06c9a47b839d5e2db94ba6bf7e29c8f0ae9. To check `@response.content_type.to_s` is ended with `"xml"`, to use `\z` is sufficient.
* | | | Merge pull request #19327 from rousisk/masterSean Griffin2015-10-221-2/+2
|\ \ \ \ | |/ / / |/| | | Change Integer#year to return a Fixnum instead of a Float to improve consistency
| * | | Change Integer#year to return a Fixnum instead of a Float to improve consistencyKonstantinos Rousis2015-10-221-2/+2
| | | |
* | | | Suppress warnings (warnings about AD::IntegrationTest HTTP request)yui-knk2015-10-221-1/+1
|/ / / | | | | | | | | | | | | These warings have been appeared from ea9bc06c9a47b839d5e2db94ba6bf7e29c8f0ae9.
* | | remove unnecessary forwardable requireTimo Schilling2015-10-211-1/+0
| | | | | | | | | `Forwardable` has been used in the past
* | | Merge pull request #20715 from simsalabim/feature/parse-rss-atom-as-xmlSean Griffin2015-10-203-14/+22
| | | | | | | | | | | | parse RSS/ATOM responses as XML, not HTML
* | | Merge pull request #22003 from yui-knk/remove_needless_require_asYves Senn2015-10-206-7/+0
|\ \ \ | | | | | | | | Delete needless `require 'active_support/deprecation'`
| * | | Delete needless `require 'active_support/deprecation'`yui-knk2015-10-206-7/+0
| | | | | | | | | | | | | | | | | | | | When `require 'active_support/rails'`, 'active_support/deprecation' is automatically loaded.
* | | | Show helpful messages on invalid param. encodingsAgis Anastasopoulos2015-10-194-8/+27
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, given a route: # config/routes.rb get ':a' => "foo#bar" If one pointed to http://example.com/%BE (param `a` has invalid encoding), a `BadRequest` would be raised with the following non-informative message: ActionController::BadRequest From now on the message displayed is: Invalid parameter encoding: hi => "\xBE" Fixes #21923.
* | | Merge pull request #19135 from yuki24/access-control-supportJeremy Daer2015-10-133-16/+60
|\ \ \ | | | | | | | | | | | | Add basic support for access control headers to ActionDispatch::Static
| * | | Add the ability of returning arbitrary headers to ActionDispatch::StaticYuki Nishijima2015-06-133-16/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now ActionDispatch::Static can accept HTTP headers so that developers will have control of returning arbitrary headers like 'Access-Control-Allow-Origin' when a response is delivered. They can be configured through `#config.public_file_server.headers`: config.public_file_server.headers = { "Cache-Control" => "public, max-age=60", "Access-Control-Allow-Origin" => "http://rubyonrails.org" } Also deprecate `config.static_cache_control` in favor of `config.public_file_server.headers`.
* | | | Merge pull request #21849 from yui-knk/refactor_regexp_to_stringAndrew White2015-10-124-7/+14
|\ \ \ \ | | | | | | | | | | Change `Journey::Route#verb` to return string instead of regexp.
| * | | | Change `Journey::Route#verb` to return string instead of regexp.yui-knk2015-10-034-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By [this commit](https://github.com/rails/rails/commit/0b476de445faf330c58255e2ec3eea0f3a7c1bfc) `Journey::Route#verb` need not to return verb as regexp. The returned value is used by inspector, so change it to be a string. Add inspect_with_multiple_verbs test case to keep the behavior of inspector correctly.
* | | | | Allow multiple `root` routes in same scope levelRafael Sales2015-10-102-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an application has multiple root entries with different constraints, the current solution is to use `get '/'`. Example: **Currently I have to do:** ```ruby get '/', to: 'portfolio#show', constraints: ->(req) { Hostname.portfolio_site?(req.host) } get '/', to: 'blog#show', constraints: ->(req) { Hostname.blog_site?(req.host) } root 'landing#show' ``` **But I would like to do:** ```ruby root 'portfolio#show', constraints: ->(req) { Hostname.portfolio_site?(req.host) } root 'blog#show', constraints: ->(req) { Hostname.blog_site?(req.host) } root 'landing#show' ``` Other URL matchers such as `get`, `post`, etc, already allows this, so I think it's fair that `root` also allow it since it's just a shortcut for a `get` internally.
* | | | | used predicate methods to avoid is_a? checksRonak Jangir2015-10-102-3/+5
| | | | |