aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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.
| * | | Merge pull request #28603 from mikeastock/alias-reverse-mergeSean Griffin2017-03-291-0/+16
| |\ \ \ | | |/ / | |/| | Add an alias for reverse_merge to with_defaults
| | * | Add aliases for reverse_merge to with_defaultsMatt Casper2017-03-291-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | In the context of controller parameters, reverse_merge is commonly used to provide defaults for user input. Having an alias to reverse_merge called with_defaults feels more idiomatic for Rails.
| * | | Add test to make sure subclasses also get helpersRafael Mendonça França2017-03-291-0/+16
| |/ /
| * | Make `driven_by` overridableFumiaki MATSUSHIMA2017-03-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes we want to use rack_test partially instead of selenium for test speed: ```ruby class ApplicationSystemTestCase < ActionDispatch::SystemTestCase driven_by :selenium, using: :chrome, screen_size: [1400, 1400], options: {url: "http://chrome:4444/wd/hub"} end class WithJavaScriptTest < ApplicationSystemTestCase end class WithoutJavaScriptTest < ApplicationSystemTestCase driven_by :rack_test end ``` In the abobe case, `WithoutJavaScriptTest` uses selenium because `SystemTestCase` calls superclass' driver on `#initialize` (`self.class.superclass.driver.use`). Using `class_attribute` can handle inherited `driven_by`.
| * | Merge pull request #28514 from y-yagi/follow_up_to_28056Andrew White2017-03-281-8/+10
| |\ \ | | | | | | | | Fix store accessors in parameters test
| | * | Fix store accessors in parameters testyuuji.yaginuma2017-03-221-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The method name must be `stored_attributes`, not `stores_attributes`. * `attribute_names` must return a non-empty value. Because `stored_attributes` is not checked if `attribute_names` is empty. Follow up to #28056
| * | | Make sure that ActionController::Api can include helpersRafael Mendonça França2017-03-271-0/+26
| |/ / | | | | | | | | | Closes #28554
| * | Merge pull request #28056 from sngeth/wrap_store_accessors_in_paramsRafael França2017-03-211-0/+13
| |\ \ | | | | | | | | Wrap stored accessors in parameters
| | * | Wrap store accessors in parametersSid Ngeth2017-03-211-0/+13
| | | | | | | | | | | | | | | | Modified params wrapper to account for model's stored_attributes
| * | | Fix test assertionRafael Mendonça França2017-03-211-1/+1
| | | |
| * | | Fix test that was asserting the wrong thingRafael Mendonça França2017-03-211-1/+1
| |/ /
| * | Revert "Merge pull request #27775 from domcleal/27774-format-reset"Rafael Mendonça França2017-03-211-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c6f9f8c28a720ad4ec7cf3613dddfa451d5968e2, reversing changes made to c309073c7476f50dfb1e796d058580f176101c36. Reason: This is fixing the behavior in the wrong place. Now the request path after the request is nil and there is no way to assert that. Also the test that was added in that PR also fails in 4.2 where the reporter says it was passing. The reason the bahavior changed between Rails 4.2 and Rails 5 is that the format in the path is now respected. The correct way to fix the problem is not doign two requests in the same controller test and use integrations tests. This change caused a regression between Rails 5.0.1 and 5.0.2.
| * | Add support for calling nested direct routes (#28462)Andrew White2017-03-171-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all requirements can be expressed in terms of polymorphic url options so add a `route_for` method that allows calling another direct route (or regular named route) which a set of arguments, e.g: resources :buckets direct :recordable do |recording| route_for(:bucket, recording.bucket) end direct :threadable do |threadable| route_for(:recordable, threadable.parent) end This maintains the context of the original caller, e.g. threadable_path(threadable) # => /buckets/1 threadable_url(threadable) # => http://example.com/buckets/1
| * | Merge pull request #28341 from mtsmfm/pass-options-to-driven-byRafael França2017-03-171-1/+2
| |\ \ | | | | | | | | Pass options to `driven_by`
| | * | Pass options to `driven_by`Fumiaki MATSUSHIMA2017-03-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capybara drivers can handle some options such like `url`. ### before ``` # test/test_helper.rb Capybara.register_driver :remote_chrome do |app| Capybara::Selenium::Driver.new(app, browser: :chrome, url: "http://example.com/wd/hub") end # test/application_system_test_case.rb class ApplicationSystemTestCase < ActionDispatch::SystemTestCase driven_by :remote_chrome end ``` ### after ``` # test/application_system_test_case.rb class ApplicationSystemTestCase < ActionDispatch::SystemTestCase driven_by :selenium, using: :chrome, screen_size: [1400, 1400], options: {url: "http://chrome:4444/wd/hub"} end ```
| * | | Remove unnecessary params mungingAndrew White2017-03-151-0/+61
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | In 9b654d4 some params munging was added to ensure that they were set whenever `recognize_path` would call either a proc or callable constraint. Since we no longer mutate the environment hash within the method it's now unnecessary and actually causes params to leak between route matches before checking constraints. Fixes #28398.
| * | Fixes ActionController::Rendering#with_defaultsalpaca-tc2017-03-121-0/+10
| | | | | | | | | | | | `env` is undefined.
| * | Use correct value in `reverse_merge` testyuuji.yaginuma2017-03-111-8/+4
| | |
| * | Merge pull request #28355 from Edouard-chin/reversemerge-for-strongparametersRafael Mendonça França2017-03-101-0/+29
| |\ \ | | | | | | | | | | | | | | | | | | | | Added `reverse_merge`/`reverse_merge!` to AC::Parameters: [Rafael Mendonça França + Mitsutaka Mimura]