aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
Commit message (Collapse)AuthorAgeFilesLines
* fix type fully qualified [ci skip]Yauheni Dakuka2017-09-061-1/+1
|
* Merge pull request #30367 from ptoomey3/consistent-cache-control-headersAaron Patterson2017-09-051-0/+21
|\ | | | | Normalize/process Cache-Control headers consistently
| * Use equality in place of refute assertions for accuracyPatrick Toomey2017-08-221-4/+2
| |
| * Normalize/process Cach-Control headers consistentlyPatrick Toomey2017-08-221-0/+23
| | | | | | | | | | | | | | | | | | | | In the existing logic, the `Cache-Control` header may or may not get normalized by additional logic depending on whether `response.cache_conrol` has been modified. This leads to inconsistent behavior, since sometimes `Cache-Control` can contain whatever a user sets and sometimes it gets normalized, based on the logic inside of `set_conditional_cache_control!`. It seems like this normalization process should happen regardless to ensure consistent behavior.
* | Merge pull request #30493 from ↵Ryuta Kamizono2017-09-021-0/+12
|\ \ | | | | | | | | | | | | koic/fix_cant_modify_frozen_string_error_in_ac_rendering Fix `can't modify frozen String` error in AC::Rendering
| * | Fix `can't modify frozen String` error in AC::RenderingKoichi ITO2017-09-021-0/+12
| | |
* | | Unused variablesAkira Matsuda2017-09-011-2/+2
|/ /
* | Merge pull request #30433 from ↵Ryuta Kamizono2017-08-291-0/+38
|\ \ | | | | | | | | | | | | y-yagi/fix_cant_modify_forzen_string_error_in_debug_locks Fix `can't modify frozen String` error in `DebugLocks`
| * | Fix `can't modify frozen String` error in `DebugLocks`yuuji.yaginuma2017-08-281-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, `DebugLocks` middleware raises an error as follwing: ``` Puma caught this error: can't modify frozen String (RuntimeError) actionpack/lib/action_dispatch/middleware/debug_locks.rb:97:in `block in render_details' actionpack/lib/action_dispatch/middleware/debug_locks.rb:64:in `each' actionpack/lib/action_dispatch/middleware/debug_locks.rb:64:in `map' actionpack/lib/action_dispatch/middleware/debug_locks.rb:64:in `render_details' actionpack/lib/action_dispatch/middleware/debug_locks.rb:37:in `call' railties/lib/rails/engine.rb:524:in `call' ```
* | | Retrive screenshot in relative path of current directoryyuuji.yaginuma2017-08-271-8/+24
|/ / | | | | | | | | | | | | | | | | | | In Rails engine `Rails.root `returns the path of the dummy application. Therefore, there is no `tmp` directly where the test is running, so can not get the screenshot. For this reason, instead of directly specifying tmp, retrive screenshot by relative path from the current directory. Fixes #30405
* / Fix `can't modify frozen String` error in `display_image`yuuji.yaginuma2017-08-261-0/+15
|/ | | | | | | | | | Without this, `display_image` raises an error as follwing: ``` RuntimeError: can't modify frozen String rails/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb:72:in `display_image' rails/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb:40:in `block (2 levels) in <class:ScreenshotHelperTest>' ```
* Merge pull request #30121 from assain/add_expires_in_and_expires_at_to_cookiesKasper Timm Hansen2017-08-202-2/+39
|\ | | | | Add expiry metadata to Cookies and freshen expires option to support duration
| * freshen :expires option with duration support and add expiry metadata to cookiesAssain2017-08-202-2/+39
| |
* | Fix RuboCop offensesKoichi ITO2017-08-166-28/+28
|/ | | | And enable `context_dependent` of Style/BracesAroundHashParameters cop.
* Merge pull request #30104 from trev/deprecate-actiondispatch-testresponse-aliasRafael França2017-08-081-0/+7
|\ | | | | Deprecate ActionDispatch::TestResponse response aliases
| * Deprecate ActionDispatch::TestResponse response aliasesTrevor Wistaff2017-08-071-0/+7
| | | | | | | | https://github.com/rails/rails/issues/30072
* | Merge pull request #29767 from yui-knk/ac_testRafael França2017-08-081-7/+2
|\ \ | |/ |/| Remove needless restoring of `default_charset`
| * Remove needless restoring of `default_charset`yui-knk2017-07-131-7/+2
| | | | | | | | | | | | `default_charset` is not changed in this test case, so we do not need to backup an original value and restore it.
* | Merge pull request #29958 from znz/file-nullMatthew Draper2017-08-021-1/+1
|\ \ | | | | | | Use File::NULL instead of "/dev/null"
| * | Use File::NULL instead of "/dev/null"Kazuhiro NISHIYAMA2017-07-311-1/+1
| | |
* | | Clarify route encoding testeileencodes2017-08-011-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this test changed in 9220935 I noticed that it really doesn't make sense anymore. I split the tests into 2 groups to explain what each one does. First these routes should throw a `bad_request` when the encoding isn't valid. We're expecting UTF8 encoding and passing binary, that should be a bad request. For the second test we are setting the `show` route to set `self.binary_params_for?` for that route which will convert the parameters and return a `:ok` instead of a `:bad_request`.
* | | Path parameters should default to UTF8eileencodes2017-08-012-4/+24
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes the behavior such the path_params now default to UTF8 just like regular parameters. This also changes the behavior such that if a path parameter contains invalid UTF8 it returns a 400 bad request. Previously the behavior was to encode the path params as binary but that's not the same as query params. So this commit makes path params behave the same as query params. It's important to test with a path that's encoded as binary because that's how paths are encoded from the socket. The test that was altered was changed to make the behavior for bad encoding the same as query params. We want to treat path params the same as query params. The params in the test are invalid UTF8 so they should return a bad request. Fixes #29669 *Eileen M. Uchitelle, Aaron Patterson, & Tsukuru Tanimichi*
* | Use frozen string literal in actionpack/Kir Shatrov2017-07-29152-1/+303
| |
* | Make actionpack frozen string friendlyKir Shatrov2017-07-247-8/+22
| |
* | Scrub the invalid paramter value before using it in the errorArthur Neves2017-07-171-1/+2
|/ | | | | | | 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.
* normalize_path used to be nil tolerantAkira Matsuda2017-07-121-0/+4
| | | | fixes a regression introduced at 8607c25ba7810573733d9b37d0015154ba059f5e
* [Action Pack] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-116-0/+6
|
* Add ActionController::Base.skip_forgery_protectionLisa Ugray2017-07-101-0/+30
| | | | | | Since we now default to `protect_from_forgery with: :exception`, provide a wrapper to `skip_before_action :verify_authenticity_token` for disabling forgery protection.
* Merge pull request #29655 from kirs/frozen-friendly-ap-arMatthew Draper2017-07-106-7/+13
|\ | | | | Prepare AP and AR to be frozen string friendly
| * Prepare AP and AR to be frozen string friendlyKir Shatrov2017-07-066-7/+13
| |
* | Don't call register on custom driverseileencodes2017-07-081-2/+2
|/ | | | | | | | | | | | | 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
* 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.