aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| | | |
| * | | Maintain original encoding from patheileencodes2017-05-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Remove `:doc:` in `:nodoc:` class [ci skip]Ryuta Kamizono2017-05-011-2/+2
| | | | | | | | | | | | | | | | | | | | The `:doc:` was added in bc478158 but originally `UriEncoder` is a `:nodoc:` class.
| * | | Add periodJon Moss2017-04-301-1/+1
| | | | | | | | | | | | | | | | [ci skip]
| * | | Add docs for Router::Utils.unescape_uri methoddixpac2017-04-301-0/+4
| | | |
| * | | Do not try to encoding the parameters when the controller is not definedRafael Mendonça França2017-04-261-1/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you have a route that points to an nonexistent controller we raise an exception. This exception was being caught by the DebugExceptions middleware in development, but when trying to render the error page, we are reading the request format[[1][]]. To determine the request format we are reading the format parameters[[2][]], and to be able to read the parameters we need to encode them[[3][]]. This was raising another exception that to encode the parameter we try to load the controller to determine if we need to encode the parameters are binary[[4][]]. This new exception inside the DebugExceptions middleware makes Rails to render a generic error page. To avoid this new exception now we only encode the parameters when the controller can be loaded. Fixes #28892 [1]: https://github.com/rails/rails/blob/f52cdaac6336f99d13622ff9bda556a3124a4121/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb#L80 [2]: https://github.com/rails/rails/blob/f52cdaac6336f99d13622ff9bda556a3124a4121/actionpack/lib/action_dispatch/http/mime_negotiation.rb#L63 [3]: https://github.com/rails/rails/blob/f52cdaac6336f99d13622ff9bda556a3124a4121/actionpack/lib/action_dispatch/http/parameters.rb#L58 [4]: https://github.com/rails/rails/blob/f52cdaac6336f99d13622ff9bda556a3124a4121/actionpack/lib/action_dispatch/http/parameters.rb#L88
| * | `respond_to_missing?` should be privateRyuta Kamizono2017-04-223-11/+13
| | | | | | | | | | | | | | | | | | | | | Follow up of 03d3f036. Some of `respond_to?` were replaced to `respond_to_missing?` in 03d3f036. But the visibility is still public. It should be private.
* | | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-254-25/+6
|\| |
| * | Reuse the Parameters#to_h check in the routing helpersRafael Mendonça França2017-04-183-24/+4
| | | | | | | | | | | | | | | Since this protection is now in Parameters we can use it instead of reimplementing again.
| * | Use more specific check for :format in route pathAndrew White2017-04-181-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-0335-106/+675
|\|
| * Make `driven_by` overridableFumiaki MATSUSHIMA2017-03-291-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #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-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
| | |
| * | 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-173-24/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-172-3/+4
| |\ \ | | | | | | | | Pass options to `driven_by`
| | * | Pass options to `driven_by`Fumiaki MATSUSHIMA2017-03-132-3/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Fix Typo [ci skip]Olivier2017-03-131-1/+1
| | | | | | | | | Arcticle --> Article
| * | 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
| * Call system test driver per-instance rather than globallyeileencodes2017-03-093-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-093-40/+24
| | | | | | | | | | | | | | 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.
| * Merge pull request #28301 from y-yagi/fix_direct_with_params_exampleJon Moss2017-03-051-1/+1
| |\ | | | | | | Fix `direct` with params example [ci skip]
| | * Fix `direct` with params example [ci skip]yuuji.yaginuma2017-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | Since `ActionController:Parameters` does not inherit `Hash`, need to explicitly convert it to `Hash`. Also, `Parameters#to_h` returns `Hash` whose key is `String`. Therefore, if merge as it is, the value will not be overwritten as expected.
| | * Silence puma startup messages in system testyuuji.yaginuma2017-03-041-1/+1
| | | | | | | | | | | | Fixes #28109
| * | Do not take screenshot if driver does not support screenshotyuuji.yaginuma2017-03-041-1/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | | | `Capybara::RackTest::Driver` does not support taking screenshots. If call `#save_screenshot` on `Capybara::RackTest::Driver` will raise the error. ```ruby Error: UsersTest#test_visiting_the_index: Capybara::NotSupportedByDriverError: Capybara::Driver::Base#save_screenshot ``` To prevent errors, if driver does not support screenshot, do not call it.
| * Fix random failure on system test with ajaxFumiaki MATSUSHIMA2017-03-031-1/+1
| | | | | | | | | | | | | | | | If application has ajax, browser may begin request after rollback. `teardown_fixtures` will be called after `super` on `after_teardown` so we must call `Capybara.reset_sessions!` before `super` https://github.com/rails/rails/blob/b61a56541aecd7ac685d4f19d943177a3f1b465a/activerecord/lib/active_record/fixtures.rb#L857
| * Take failed screenshot before reset driveryuuji.yaginuma2017-02-281-1/+1
| | | | | | | | | | | | | | Now reset the driver before take failed screenshot since #28144. However, I think that failed screenshot should be take with the driver actually used in the test. So, fixed to take screenshot before reset driver.
| * Remove unused params.Jerry Tao2017-02-262-2/+2
| |
| * Commit flash changes when using a redirect route.Andrew White2017-02-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | In ca324a0 the flash middleware was effectively removed by its constructor returning the app it was passed and the `commit_flash` call was moved to the `ActionController::Metal#dispatch` method. This broke any redirect routes that modified the flash because the redirect happens before `dispatch` gets called. To fix it, this commit adds a `commit_flash` call in the `serve` method of `ActionDispatch::Routing::Redirect`. Fixes #27992.