aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
* Scrub the invalid paramter value before using it in the errorArthur Neves2017-07-171-1/+1
| | | | | | | You should be able to safely use the String error message. So when finding the paramter has an invalid encoding we need to remove the invalid bytes before using it in the error. Otherwise the caller might get another Encoding error if they use the message.
* `Response#charset=` uses `default_charset` when `nil` is passedyui-knk2017-07-131-1/+1
|
* normalize_path used to be nil tolerantAkira Matsuda2017-07-121-0/+1
| | | | fixes a regression introduced at 8607c25ba7810573733d9b37d0015154ba059f5e
* [Action Pack] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-1110-0/+10
|
* Merge pull request #29655 from kirs/frozen-friendly-ap-arMatthew Draper2017-07-109-10/+19
|\ | | | | Prepare AP and AR to be frozen string friendly
| * Prepare AP and AR to be frozen string friendlyKir Shatrov2017-07-069-10/+19
| |
* | Don't call register on custom driverseileencodes2017-07-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | It's possible for developers toadd a custom driver and then call it using `driven_by`. Because we were only skipping `register` for `:rack_test` that meant any custom driver would attempt to be registered as well. The three listed here are special because Rails registers them with special options. If you're registering your own custom driver then you don't want to separately register that driver. Fixes #29688
* | Allow mounting same engine under several locationsDavid Rodríguez2017-07-053-10/+20
|/
* Merge branch 'master' into require_relative_2017Xavier Noria2017-07-026-23/+42
|\
| * Merge pull request #29622 from yalab/warning_system_tesing_http_verbEileen M. Uchitelle2017-07-012-0/+26
| |\ | | | | | | Warning http verb method call in SystemTestCase
| | * SystemTestCase undef some IntegrationTest methods because it's confused to use.yalab2017-07-012-0/+26
| | |
| * | Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-0276-76/+0
| | | | | | | | | | | | | | | This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
| * | Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-0276-0/+76
| |\ \ | | | | | | | | | | | | Enforce frozen string in Rubocop
| | * | Enforce frozen string in RubocopKir Shatrov2017-07-0176-0/+76
| | |/
| * | Merge pull request #29506 from pat/frozen-string-literalsMatthew Draper2017-07-023-5/+5
| |\ \ | | | | | | | | | | | | Make ActiveSupport frozen-string-literal friendly.
| | * | Make ActionView frozen string literal friendly.Pat Allan2017-06-202-2/+2
| | | | | | | | | | | | | | | | Plus a couple of related ActionPack patches.
| | * | Make ActionMailer frozen string literal friendly.Pat Allan2017-06-202-2/+2
| | | |
| | * | Make ActiveModel frozen string literal friendly.Pat Allan2017-06-201-1/+1
| | | | | | | | | | | | | | | | Includes two external changes because they're referenced within the ActiveModel test suite.
| * | | Merge pull request #29644 from wilson/unify-route-helper-visibilityMatthew Draper2017-07-011-18/+11
| |\ \ \ | | |_|/ | |/| | | | | | Properly register "custom" URL helpers as named helpers.
| | * | Properly register "custom" URL helpers as named helpers.Wilson Bilkovich2017-06-301-18/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CustomUrlHelpers were introduced in ce7d5fb2e6, closing issue #22512. They currently register themselves in an ivar that is never accessed. This change removes the @custom_helpers special-case, and registers them the way named routes are normally handled. Without this, you can get route_defined?(:example_url) == false, while still being able to call url_helpers.example_url and example_path. Various popular gems such as 'rspec-rails' make use of route_defined?() when determining how to proxy method calls or whether to define a route.
* / / [Action Dispatch] require => require_relativeAkira Matsuda2017-07-0127-57/+57
|/ /
* | Merge pull request #29533 from jdelStrother/missing_url_formatsRichard Schneeman2017-06-271-0/+2
|\ \ | | | | | | Fix missing formats in route-set URLs
| * | Fix missing formats in route-set URLsJonathan del Strother2017-06-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, handle_positional_args would end up mutating @segment_keys if inner_options included path components. Subsequent calls would then be missing the implicit path components. eg: user_path(1, :json) # => "/users/1.json" (correct) user_path(1, format: :json) # => "/users/1.json" (correct, but @segment_keys was mutated) user_path(1, :json) # => "/users/1" (oh no!)
* | | Calling `follow_redirect!` does not reset the `html_document`:Edouard CHIN2017-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When making a request to a controller that redirects, `follow_redirect!` would not reset the `html_document` ivar, it only resets the `html_document` ivar from the session (not the runner) - If one was doing something like this; ```ruby get '/redirect' assert_select 'you are being redirected' follow_redirect! # html_document is memoized and doesn't get reset ``` - To fix the issue we can do the same for any other methods (`get`, `post`...) and define a method in the runner that delegates to the session but clears the html_document_first - Fixes #29367
* | | Add an option to silence puma in system tests.Sam Phippen2017-06-241-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is motivated by our usage of system test in RSpec. Puma lazily boots the first time a system test is used, but this causes some unfortunate output to appear in the middle of the user's green dots. An example of this can be seen in @derekprior's comment [here](https://github.com/rspec/rspec-rails/pull/1813#issuecomment-309252314). There are alternatives in RSpec where we attempt to intercept the puma boot and prevent the output from being made there, but that would involve some monkey patching. This seems like a cleaner solution.
* | | Removed reference to unexisting methods:Edouard CHIN2017-06-231-2/+1
|/ / | | | | | | `get/post_via_redirect`, `xhr` and his alias `xml_http_request` were respectively removed in 092033d59f7e2b248f6c6ab6c0b67339c5e9f2df and eb52e5d42fbdc9288925a402dcb3c5664d1125b7
* | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-06-1617-65/+127
|\|
| * Fix formatting of AD::FileHandler and AD::Static doc [ci skip]yuuji.yaginuma2017-06-131-7/+7
| |
| * Merge pull request #29263 from assain/default_message_encryptor_to_gcmKasper Timm Hansen2017-06-111-1/+1
| |\ | | | | | | Default Message Encryptor Cipher to AES-256-GCM From AES-256-CBC
| | * set message_encryptor default cipher to aes-256-gcmAssain2017-06-121-1/+1
| | | | | | | | | | | | - Introduce a method to select default cipher, and maintain backward compatibility
| * | Tiny documentation fixes [ci skip]Robin Dupret2017-06-061-3/+3
| |/
| * Merge pull request #29294 from gsamokovarov/attributes-defaultKasper Timm Hansen2017-06-046-16/+8
| |\ | | | | | | Introduce mattr_accessor default option
| | * Use mattr_accessor default: option throughout the projectGenadi Samokovarov2017-06-036-16/+8
| | |
| * | Fix typo on error message when route definition is ambiguous.André Luis Leal Cardoso Junior2017-06-031-1/+1
| | |
| * | [ci skip] Fix typo in the system tests docsPrathamesh Sonpatki2017-06-031-1/+1
| | |
| * | Fix formatting of `direct` and `resolve` doc [ci skip]yuuji.yaginuma2017-06-031-14/+14
| |/
| * SystemTesting::Driver can register capybara-webkit and poltergeistMario Alberto Chávez2017-06-022-7/+30
| | | | | | | | | | | | | | | | | | | | drivers. When using `driver_by` with capybara-webkit or poltergeist, SystemTesting::Driver will register the driver while passing `screen_size` and `options` parameteres. `options` could contain any option supported by the underlying driver.
| * Merge pull request #29191 from ↵Kasper Timm Hansen2017-05-291-5/+5
| |\ | | | | | | | | | | | | bogdanvlviv/pass_params_filename_lineno_to_class_eval Pass params __FILE__ and __LINE__ + 1 if class_eval with <<
| | * Pass params __FILE__ and __LINE__ + 1 if class_eval with <<bogdanvlviv2017-05-291-5/+5
| | |
| * | Merge pull request #28132 from mikeycgto/aead-encrypted-cookiesKasper Timm Hansen2017-05-282-3/+51
| |\ \ | | | | | | | | AEAD encrypted cookies and sessions
| | * | AEAD encrypted cookies and sessionsMichael Coyne2017-05-222-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes encrypted cookies from AES in CBC HMAC mode to Authenticated Encryption using AES-GCM. It also provides a cookie jar to transparently upgrade encrypted cookies to this new scheme. Some other notable changes include: - There is a new application configuration value: +use_authenticated_cookie_encryption+. When enabled, AEAD encrypted cookies will be used. - +cookies.signed+ does not raise a +TypeError+ now if the name of an encrypted cookie is used. Encrypted cookies using the same key as signed cookies would be verified and serialization would then fail due the message still be encrypted.
| * | | Merge pull request #28895 from codeforkjeff/fix-session-keys-and-values-methodsMatthew Draper2017-05-281-0/+2
| |\ \ \ | | | | | | | | | | Add lazy loading to #keys and #values methods in Session
| | * | | Add lazy loading to #keys and #values methods in Sessioncodeforkjeff2017-04-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where session.keys and session.values return an empty array unless one of the other methods that does lazy loading from the underlying store is called first. #keys and #values should also call #load_for_read!
| * | | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__Matthew Draper2017-05-262-2/+2
| |\ \ \ \ | | | | | | | | | | | | Define path with __dir__
| | * | | | Define path with __dir__bogdanvlviv2017-05-232-2/+2
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | ".. with __dir__ we can restore order in the Universe." - by @fxn Related to 5b8738c2df003a96f0e490c43559747618d10f5f
| * | | | Merge pull request #28644 from mtsmfm/set-capybara-app-hostMatthew Draper2017-05-241-1/+6
| |\ \ \ \ | | |_|_|/ | |/| | | Set `Capybara.app_host` through `host!`
| | * | | Set `Capybara.app_host` through `host!`Fumiaki MATSUSHIMA2017-04-021-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `visit "/"` will visit always "http://127.0.0.1" even when we call `host!`: ```ruby class SomeTest < ApplicationSystemTest def setup host! "http://example.com" end def test_visit visit root_url # => visit "http://example.com/" visit "/" # => visit "http://127.0.0.1/" end end ``` Because Capybara assumes that host is same as the server if we don't set `Capybara.app_host`: https://github.com/teamcapybara/capybara/blob/866c975076f92b5d064ee8998be638dd213f0724/lib/capybara/session.rb#L239
| * | | | Remove unused simulate methodeileencodes2017-05-221-8/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | This method was only used in the Rails tests and not by other methods in the Rails simulator. Because it's a no-doc'd class it should be safe to remove without deprecation.
* | | | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-05-176-16/+34
|\| | |
| * | | Fixed string being modified in place causing frozen string errors in Ruby 2.3sepehr5002017-05-151-2/+6
| | | |