aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29566 from eugeneius/wrap_parameters_queryKasper Timm Hansen2017-07-021-0/+8
|\ | | | | Don't wrap parameters if query parameter exists
| * Don't wrap parameters if query parameter existsEugene Kenny2017-06-251-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | We want to avoid overwriting a query parameter with the wrapped parameters hash. Previously this was implemented by merging the wrapped parameters at the root level if the key already existed, which was effectively a no-op. The query parameter was still overwritten in the filtered parameters hash, however. We can fix that discrepancy with a simpler implementation and less unnecessary work by skipping parameter wrapping entirely if the key was sent as a query parameter.
* | Merge pull request #29622 from yalab/warning_system_tesing_http_verbEileen M. Uchitelle2017-07-011-0/+32
|\ \ | | | | | | Warning http verb method call in SystemTestCase
| * | SystemTestCase undef some IntegrationTest methods because it's confused to use.yalab2017-07-011-0/+32
| | |
* | | Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-02173-173/+0
| | | | | | | | | | | | | | | This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
* | | Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-02173-0/+173
|\ \ \ | | | | | | | | | | | | Enforce frozen string in Rubocop
| * | | Enforce frozen string in RubocopKir Shatrov2017-07-01173-0/+173
| |/ /
* | | Properly register "custom" URL helpers as named helpers.Wilson Bilkovich2017-06-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Fallback Parameters#to_s to Hash#to_sKir Shatrov2017-06-301-0/+5
|/ / | | | | Fixes https://github.com/rails/rails/issues/29617
* | Merge pull request #29533 from jdelStrother/missing_url_formatsRichard Schneeman2017-06-271-0/+9
|\ \ | | | | | | Fix missing formats in route-set URLs
| * | Fix missing formats in route-set URLsJonathan del Strother2017-06-231-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+12
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | - 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
* | Don't wrap parameters if key already existsEugene Kenny2017-06-241-0/+8
|/ | | | | | | | | | | | | | | | | We shouldn't perform parameter wrapping if it would overwrite one of the parameters sent with the request, as that would interfere with reading the parameter directly from the top level `params` hash. The current implementation has logic for this case, but it doesn't handle `nil`/`false` values, which means these parameters: { "user" => nil } are transformed into this `params` hash: { "user" => { "user" => nil } } and `params["user"]` no longer returns the original parameter value.
* prepare for Minitest 6utilum2017-06-201-1/+1
|
* Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-06-1626-163/+275
|\
| * Allow translate default option to accept an array similar to i18n.t. Fixes ↵Vipul A M2017-06-151-0/+1
| | | | | | | | #29441
| * SystemTesting::Driver can register capybara-webkit and poltergeistMario Alberto Chávez2017-06-021-2/+16
| | | | | | | | | | | | | | | | | | | | 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 #28132 from mikeycgto/aead-encrypted-cookiesKasper Timm Hansen2017-05-281-86/+120
| |\ | | | | | | AEAD encrypted cookies and sessions
| | * AEAD encrypted cookies and sessionsMichael Coyne2017-05-221-86/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+18
| |\ \ | | | | | | | | Add lazy loading to #keys and #values methods in Session
| | * | Add lazy loading to #keys and #values methods in Sessioncodeforkjeff2017-04-261-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2615-34/+34
| |\ \ \ | | | | | | | | | | Define path with __dir__
| | * | | Define path with __dir__bogdanvlviv2017-05-2315-34/+34
| | | |/ | | |/| | | | | | | | | | | | | | | | | ".. 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-0/+12
| |\ \ \ | | | | | | | | | | Set `Capybara.app_host` through `host!`
| | * | | Set `Capybara.app_host` through `host!`Fumiaki MATSUSHIMA2017-04-021-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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-13/+21
| | |/ / | |/| | | | | | | | | | | | | | | | | | 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.
| * | | Use recyclable cache keys (#29092)David Heinemeier Hansson2017-05-186-28/+53
| | | |
* | | | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-05-175-8/+40
|\| | |
| * | | Fixed string being modified in place causing frozen string errors in Ruby 2.3sepehr5002017-05-151-0/+6
| | | |
| * | | Fix `TestInvalidUrls` with rack 2.0.3yuuji.yaginuma2017-05-161-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, raise `BadRequest` if params encoding is invalid. https://github.com/rails/rails/blob/5-1-stable/actionpack/lib/action_dispatch/http/parameters.rb#L64..L74 https://github.com/rails/rails/blob/5-1-stable/actionpack/lib/action_dispatch/request/utils.rb#L26..L39 However, env values are ensure encoded in ASCII 8 BIT at rack 2.0.3. https://github.com/rack/rack/commit/68db9aa99e3e2775a58621f658b2a7a0f67db459 Therefore, even if specify an invalid urls, it will not cause an error.
| * | | Merge pull request #29062 from ↵Eileen M. Uchitelle2017-05-121-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | eileencodes/force-encoding-to-original-string-encoding Maintain original encoding from path
| | * | | Maintain original encoding from patheileencodes2017-05-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the path info is read from the socket it's encoded as ASCII 8BIT. The unescape method changes the encoding to UTF8 but it should maintain the encoding of the string that's passed in. This causes parameters to be force encoded to UTF8 when we don't actually know what the encoding of the parameter should be.
| * | | | Pass block in ActionController::Parameters#deleteEugene Kenny2017-05-101-0/+21
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to fully support the same interface as `Hash#delete`, we need to pass the block through to the underlying method, not just the key. This used to work correctly, but it regressed when `ActionController::Parameters` stopped inheriting from `Hash` in 5.0.
| * | / Should escape meta characters in regexpRyuta Kamizono2017-05-071-2/+2
| | |/ | |/|
* | | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-2513-37/+206
|\| |
| * | Add test case to make sure we can implicit convert a Parameters to a HashRafael Mendonça França2017-04-201-0/+7
| | |
| * | Fix all style guides violationsRafael Mendonça França2017-04-196-6/+6
| | | | | | | | | | | | | | | Closes #28382 Closes #28651
| * | Reuse the Parameters#to_h check in the routing helpersRafael Mendonça França2017-04-184-8/+8
| | | | | | | | | | | | | | | Since this protection is now in Parameters we can use it instead of reimplementing again.
| * | Implement ActionController::Parameters#to_query and #to_paramRafael Mendonça França2017-04-181-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was raising an error because it may be unsafe to use those methods in a unpermitted parameter. Now we delegate to to_h that already raise an error when the Parameters instance is not permitted. This also fix a bug when using `#to_query` in a hash that contains a `ActionController::Parameters` instance and was returning the name of the class in the string.
| * | Use the right assetions to better error messagesRafael Mendonça França2017-04-181-7/+7
| | |
| * | Add test to make sure that to_unsafe_h don't mutate the targetRafael Mendonça França2017-04-181-0/+10
| | |
| * | Add ActionController::Parameters#to_hash to implict conversionRafael Mendonça França2017-04-181-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | Now methods that implicit convert objects to a hash will be able to work without requiring the users to change their implementation. This method will return a Hash instead of a HashWithIndefirentAccess to mimic the same implementation of HashWithIndefirentAccess#to_hash.
| * | Raise exception when calling to_h in a unfiltered ParametersRafael Mendonça França2017-04-181-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we returned either an empty hash or only the always permitted parameters (:controller and :action by default). The previous behavior was dangerous because in order to get the attributes users usually fallback to use to_unsafe_h that could potentially introduce security issues. The to_unsafe_h API is also not good since Parameters is a object that quacks like a Hash but not in all cases since to_h would return an empty hash and users were forced to check if to_unsafe_h is defined or if the instance is a ActionController::Parameters in order to work with it. This end up coupling a lot of libraries and parts of the application with something that is from the controller layer.
| * | Test the correct objectRafael Mendonça França2017-04-181-1/+1
| | |
| * | Use more specific check for :format in route pathAndrew White2017-04-181-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current check for whether to add an optional format to the path is very lax and will match things like `:format_id` where there are nested resources, e.g: resources :formats do resources :items end Fix this by using a more restrictive regex pattern that looks for the patterns `(.:format)`, `.:format` or `/` at the end of the path. Note that we need to allow for multiple closing parenthesis since the route may be of this form: get "/books(/:action(.:format))", controller: "books" This probably isn't what's intended since it means that the default index action route doesn't support a format but we have a test for it so we need to allow it. Fixes #28517.
| * | Default embed_authenticity_token_in_remote_forms to nil.Kasper Timm Hansen2017-04-161-0/+90
| | | | | | | | | | | | | | | | | | | | | Effectively treat nil values as "auto", e.g. whatever a form helper chooses to interpret it as. But treat an explicitly assigned false value as disabling.
| * | Improve logging when Origin header doesn't matchJon Leighton2017-04-061-0/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | I came up against this while dealing with a misconfigured server. The browser was setting the Origin header to "https://example.com", but the Rails app returned "http://example.com" from request.base_url (because it was failing to detect that HTTPS was used). This caused verify_authenticity_token to fail, but the message in the log was "Can't verify CSRF token", which is confusing because the failure had nothing to do with the CSRF token sent in the request. This made it very hard to identify the issue, so hopefully this will make it more obvious for the next person.
* | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-0318-20/+797
|\|
| * Merge pull request #28606 from maclover7/jm-fix-25820Andrew White2017-03-302-0/+57
| |\ | | | | | | Do not include default response headers for AC::Metal
| | * Do not include default response headers for AC::MetalJon Moss2017-03-292-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 4.2, `ActionController::Metal` controllers did not include the default headers from `ActionDispatch::Response`. However, through e16afe6, and a general shift towards having `ActionController::Metal` objects contain `ActionDispatch::Response` objects (instead of just returning an array of status, headers, and body), this behavior was lost. This PR helps to restore the original behavior by having `ActionController::Metal` controllers generate Response objects without the default headers, while `ActionController::Base` now overrides the factory method to make sure its version does have the default headers.