aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Improve logging when Origin header doesn't matchJon Leighton2017-04-062-1/+16
| | | | | | | | | | | | | 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 pull request #28606 from maclover7/jm-fix-25820Andrew White2017-03-304-1/+64
|\ | | | | Do not include default response headers for AC::Metal
| * Do not include default response headers for AC::MetalJon Moss2017-03-294-1/+64
| | | | | | | | | | | | | | | | | | | | | | | | 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-292-0/+18
|\ \ | |/ |/| Add an alias for reverse_merge to with_defaults
| * Add aliases for reverse_merge to with_defaultsMatt Casper2017-03-292-0/+18
| | | | | | | | | | | | 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-292-6/+13
| | | | | | | | | | | | | | | | | | | | | | 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 #28528 from domcleal/parseerror-const-deprecationRafael França2017-03-221-1/+2
|\ \ | | | | | | Change AD::ParamsParser::ParseError deprecation so it can be rescued
| * | Use DeprecatedConstantAccessor for AD::ParamsParser::ParseErrorDominic Cleal2017-03-221-1/+2
| | | | | | | | | | | | Fixes #28525
* | | Small grammar fixJon Moss2017-03-221-1/+1
| | | | | | | | | | | | [ci skip]
* | | Small grammar fixJon Moss2017-03-221-2/+1
|/ / | | | | | | | | | | Tried to make the sentence read more clearly. [ci skip]
* | Merge pull request #28394 from shime/docs-action-dispatchXavier Noria2017-03-2231-96/+96
|\ \ | | | | | | [docs] fix ActionDispatch documentation
| * | [docs] fix ActionDispatch documentationHrvoje Šimić2017-03-1331-96/+96
| | |
* | | Start Rails 5.2 developmentMatthew Draper2017-03-222-410/+3
| |/ |/|
* | Merge pull request #28056 from sngeth/wrap_store_accessors_in_paramsRafael França2017-03-212-1/+18
|\ \ | | | | | | Wrap stored accessors in parameters
| * | Wrap store accessors in parametersSid Ngeth2017-03-212-1/+18
| | | | | | | | | | | | 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-212-15/+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.
* | Always use original url_for when generating direct routesAndrew White2017-03-172-1/+9
| | | | | | | | | | | | | | Action View overrides `url_for` in the view context to render paths by default when using `url_for` and this means that direct route helpers don't get the full url when called with the url suffix. To fix this always call the original `url_for`.
* | Add support for calling nested direct routes (#28462)Andrew White2017-03-174-32/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-173-4/+6
|\ \ | | | | | | Pass options to `driven_by`
| * | Pass options to `driven_by`Fumiaki MATSUSHIMA2017-03-133-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ```
* | | Bump Capybara and include Minitest::Assertionseileencodes2017-03-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capybara was updated in teamcapybara/capybara#1841 to use Minitest style assertions so that system test output shows x number of assertions, x numbe of failures, etc. Before: ``` 6 runs, 0 assertions, 0 failures, 0 errors, 0 skips ``` After: ``` 6 runs, 7 assertions, 1 failures, 0 errors, 0 skips ``` This change bumps Capybara from 2.7.0 to 2.13.0 and includes the required minitest assertion file in the test case. :tada:
* | | Cleanup documentation fixes (#28460)Vipul A M2017-03-171-3/+3
| | |
* | | Updates incorrect documentation [ci skip]Dmitriy Budnik2017-03-161-4/+3
| | | | | | | | | | | | | | | Looking on code for this method it's clear that it's just returns `response.status` instead of full `response` object. It's better to correct docs as probably lots of specs are relying on this behavior.
* | | Remove unnecessary params mungingAndrew White2017-03-152-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Small grammar changeJon Moss2017-03-131-3/+1
| | | | | | | | | | | | | | | | | | Reads easier, and removes extra tick marks. [ci skip]
* | | Fix Typo [ci skip]Olivier2017-03-131-1/+1
| | | | | | | | | Arcticle --> Article
* | | Fix HTTPS grammarJon Moss2017-03-131-4/+4
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #28381 from shime/docs-action-controller-baseVipul A M2017-03-1321-55/+55
|\ \ \ | | | | | | | | [docs] fix ActionController docs
| * | | [docs] fix ActionController documentationHrvoje Šimić2017-03-1221-55/+55
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #28185 from renchap/system-testing-screenshot-outputEileen M. Uchitelle2017-03-131-5/+34
|\ \ \ \ | |_|/ / |/| | | Dont always display inline screenshots in system testing (#28133)
| * | | Dont always display inline screenshots in system testing (#28133)Renaud Chaput2017-03-111-5/+34
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 3 output types are supported: - simple: only display the screenshot path - artifact: display the screenshot in the terminal, using the artifact protocol (supported by some CI) - inline (default): display the screenshot in the terminal, inline (supported by some terminals) You can force the output type by setting the `RAILS_SYSTEM_TESTING_SCREENSHOT` environment variable
* / | Fixes ActionController::Rendering#with_defaultsalpaca-tc2017-03-123-1/+17
|/ / | | | | | | `env` is undefined.
* | Merge pull request #28378 from y-yagi/use_correct_variable_in_reverse_merge_testEileen M. Uchitelle2017-03-111-8/+4
|\ \ | | | | | | Use correct value in `reverse_merge` test
| * | Use correct value in `reverse_merge` testyuuji.yaginuma2017-03-111-8/+4
| | |
* | | [docs] remove unnecessary sentenceHrvoje Šimić2017-03-111-4/+3
| |/ |/| | | | | [ci skip]
* | Fix indentation and formatting in CHANGELOGs [ci skip]Ryuta Kamizono2017-03-111-2/+2
|/
* Add @takkanm credits in the changelog [ci skip]Rafael Mendonça França2017-03-101-1/+1
|
* Merge pull request #28355 from Edouard-chin/reversemerge-for-strongparametersRafael Mendonça França2017-03-103-0/+48
|\ | | | | | | | | | | Added `reverse_merge`/`reverse_merge!` to AC::Parameters: [Rafael Mendonça França + Mitsutaka Mimura]
| * Added `reverse_merge`/`reverse_merge!` to AC::Parameters:Edouard CHIN2017-03-093-0/+48
| | | | | | | | | | - This PR adds the `reverse_merge` and `reverse_merge!` method to `ActionController::Parameters` - Fixes #28353
* | Call system test driver per-instance rather than globallyeileencodes2017-03-097-42/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the system test subclasses would call `driven_by` when the app booted and not again when the test was initialized which resulted in the driver from whichever class was called last to be used in tests. In rails/rails#28144 the `driven_by` method was changed to run `use` on setup and `reset` on teardown. While this was a viable fix this really pointed to the problem that system test `driven_by` was a global setting, rather than a per-class setting. To alieviate this problem calling the driver should be done on an instance level, rather than on the global level. I added an `initialize` method to `SystemTestCase` which will call `use` on the superclass driver. Running the server has been moved to `start_application` so that it only needs to be called once on boot and no options from `driven_by` were being passed to it. This required a largish rewrite of the tests. Each test needs to utilize the subclass so that it can properly test the drivers. `ActionDispatch::SystemTestCase` shouldn't be called directly anymore.
* | Refactor system test driver/browsereileencodes2017-03-096-56/+35
|/ | | | | | | Since using a browser is only for selenium it doesn't really make sense to have a separate class for handling it there. This brings a lot of the if/else out of the main SystemTestCase class and into the Driver class so we can abstract away all that extra work.
* Tests for delegated public methods on AC::ParametersT.J. Schuck2017-03-071-0/+63
|
* params --> parametersJon Moss2017-03-071-2/+2
| | | | [ci skip]
* Document delegated public methods on AC::ParametersT.J. Schuck2017-03-071-0/+71
| | | [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 09:35:09 +0000