aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | [ci skip] Strike changelog entry, since it's 5.2 backported.Kasper Timm Hansen2018-07-201-11/+0
| | | | | |
* | | | | | [ci skip] Move changelog entry up top. Clarify.Kasper Timm Hansen2018-07-201-7/+11
| | | | | |
* | | | | | Merge pull request #33392 from ↵Kasper Timm Hansen2018-07-203-1/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | azbshiri/actionpack/prevent-request-encoder-to-parse-nil-params Prevent `RequestEncoder#encode_params` to parse falsey params
| * | | | | | Prevent `RequestEncoder#encode_params` to parse falsey paramsAlireza Bashiri2018-07-203-1/+22
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a `get` method called with `as: :json` and `params: nil` or `params: false` (explicitly or implicitly) `RequestEncoder#encode_params` converts it into a `null` or `false` value which includes a unexpected `null=` or `false` query string into request URL. From now on `RequestEncoder#encode_params` checks whether `params` is nil or not otherwise returns. Move down `nil` conversion guard Update CHANGELOG.md
* / / / / / Fix basic auth problem in ActionController::HttpAuthentication::Basic doc黄松2018-07-201-2/+2
|/ / / / /
* | | | | test_should_impose_childless_html_tags_in_html failure with JRubypavel2018-07-151-1/+7
| | | | |
* | | | | Merge pull request #33341 from Edouard-chin/ec-fix-to-paramRafael França2018-07-122-3/+16
|\ \ \ \ \ | | | | | | | | | | | | e4e1b62 broke `to_param` handling:
| * | | | | e4e1b62 broke `to_param` handling:Edouard CHIN2018-07-122-3/+16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - There was an issue inside controller tests where order params were not respected, the reason was because we were calling `Hash#to_query` which sorts the results lexicographically. 1e4e1b62 fixed that issue by not using `to_query` but instead a utility function provided by rack. - However with the fix came another issue where it's now no longer possible to do this ``` post :foo, params: { user: User.first } # Prior to the patch the controller will receive { "user" => "1" } # Whereas now you get { "user": "#<User: ...>" } ``` The fix in this PR is to modify `Hash#to_query` to sort only when it doesn't contain an array structure that looks something like "bar[]" Ref https://github.com/rails/rails/pull/33341#issuecomment-404039396
* / / / / Enable `Layout/EmptyLinesAroundBlockBody` to reduce review cost in the futureRyuta Kamizono2018-07-123-5/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | We sometimes ask "✂️ extra blank lines" to a contributor in reviews like https://github.com/rails/rails/pull/33337#discussion_r201509738. It is preferable to deal automatically without depending on manpower.
* | | | Pass along arguments to underlying `get` method in `follow_redirect!` (#33299)Remo Fritzsche2018-07-053-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow get arguments for follow_redirect Now all arguments passed to `follow_redirect!` are passed to the underlying `get` method. This for example allows to set custom headers for the redirection request to the server. This is especially useful for setting headers that may, outside of the testing environment, be set automatically on every request, i.e. by a web application firewall. * Allow get arguments for follow_redirect [Remo Fritzsche + Rafael Mendonça França]
* | | | Merge pull request #33054 from jboler/masterRafael França2018-07-031-0/+1
|\ \ \ \ | | | | | | | | | | Fix route eager loading
| * | | | Only build routes simulator when there is an ASTJonathan Boler2018-06-041-0/+1
| | | | |
* | | | | Fix a typo in the Action Pack changelog [ci skip]Genadi Samokovarov2018-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | I spotted it while working on a PR.
* | | | | Convert hashes into parameters (#33076)Kevin Sjöberg2018-06-192-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Convert hashes into parameters Ensure `ActionController::Parameters#transform_values` and `ActionController::Parameters#transform_values!` converts hashes into parameters. * fixup! Convert hashes into parameters [Rafael Mendonça França + Kevin Sjöberg]
* | | | | Merge pull request #33134 from dasch/dasch/extra-cache-controlsEileen M. Uchitelle2018-06-193-2/+28
|\ \ \ \ \ | | | | | | | | | | | | Add support for more HTTP cache controls
| * | | | | Add support for more HTTP cache controlsDaniel Schierbeck2018-06-133-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From <https://tools.ietf.org/html/rfc5861>: > The stale-if-error HTTP Cache-Control extension allows a cache to > return a stale response when an error -- e.g., a 500 Internal Server > Error, a network segment, or DNS failure -- is encountered, rather > than returning a "hard" error. This improves availability. > > The stale-while-revalidate HTTP Cache-Control extension allows a > cache to immediately return a stale response while it revalidates it > in the background, thereby hiding latency (both in the network and on > the server) from clients. These are useful, fully standardized parts of the HTTP protocol with widespread support among CDN vendors. Supporting them will make it easier to utilize reverse proxies and CDNs from Rails.
* | | | | | Add test case for the `|` token in Journey scannervaidehijoshi2018-06-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Journey's scanner tokenizes the `|` (:OR) operator when scanning route urls such as `"/:foo|*bar"`. However, the current scanner test does not have any test cases for the `|` operator. This commit adds a test case for this particular token.
* | | | | | Fix rubocop violationsbogdanvlviv2018-06-151-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://codeclimate.com/github/rails/rails/issues `bundle exec rubocop -a` Related to e4e1b62007fe40c4277ebc30067837a91bf25967
* | | | | Remove reference to session_store.rb initializerJustin Searls2018-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails no longer generates this file, but Google is still packed with results suggesting it should exist, so that the doc still pointed me to it threw me off (had I deleted it or something?). Probably be better to be vague and prompt the user to stick it in a config file they own. #33124
* | | | | Fix bug with eager_load in development environmentDan Jensen2018-06-112-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Modifies the routes simulator to allow for empty RouteSets, which are created when secondary Engines are loaded.
* | | | | Use Rack to generate query information under testAaron Patterson2018-06-082-3/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `to_query` sorts parameters before encoding them. This causes a round tripping issue as noted here: https://github.com/rails/rails/issues/23997#issuecomment-328297933 https://github.com/rails/rails/issues/10529#issuecomment-328298109 https://github.com/rails/rails/pull/30558 Unfortunately, that method is being used to generate cache keys, so its results need to be stable: https://github.com/rails/rails/commit/10dec0e65e1f4d87f411b4361045eba86b121be9 However, the test harness is only using `to_query` to encode parameters before sending them to the controller so the "cache key" usecase doesn't apply here. This commit adds a test that demonstrates the round trip problems and changes the serialization strategy to use Rack for encoding the parameters rather than `to_query`.
* | | | Avoid unused capture in `non_xhr_javascript_response?`Ryuta Kamizono2018-05-311-1/+1
| | | |
* | | | Include application/javascript when checking content_typeGabriel Jaldon2018-05-272-1/+6
| | | |
* | | | Remove 7 years old note-to-self by tenderloveutilum2018-05-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Introduced in rails/journey@a806beb [ci skip]
* | | | Speed up xor_byte_strings by 70%Jeremy Evans2018-05-181-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Benchmark: ```ruby require 'benchmark' require 'benchmark/ips' require 'securerandom' def xor_byte_strings(s1, s2) # :doc: s2_bytes = s2.bytes s1.each_byte.with_index { |c1, i| s2_bytes[i] ^= c1 } s2_bytes.pack("C*") end def xor_byte_strings_new(s1, s2) # :doc: s2 = s2.dup size = s1.bytesize i = 0 while i < size s2.setbyte(i, s1.getbyte(i) ^ s2.getbyte(i)) i += 1 end s2 end s1 = SecureRandom.random_bytes(32) s2 = SecureRandom.random_bytes(32) Benchmark.ips do |x| x.report("current"){xor_byte_strings(s1, s2)} x.report("new"){xor_byte_strings_new(s1, s2)} x.compare! end 100000.times do |i| s3 = SecureRandom.random_bytes(32) s4 = SecureRandom.random_bytes(32) raise unless xor_byte_strings(s3, s4) == xor_byte_strings_new(s3, s4) end ``` Results on ruby 2.5.1: ``` Warming up -------------------------------------- current 6.519k i/100ms new 10.508k i/100ms Calculating ------------------------------------- current 84.723k (_ 0.4%) i/s - 423.735k in 5.001456s new 145.871k (_ 0.3%) i/s - 735.560k in 5.042606s Comparison: new: 145870.6 i/s current: 84723.4 i/s - 1.72x slower ```
* | | | Fix documentation for ActionController::Params#fetchLinus Marton2018-05-181-1/+3
| |_|/ |/| | | | | | | | | | | Make it clear that the return value is converted to an instance of ActionController::Parameters if possible
* | | Fix `CustomCops/AssertNot` to allow it to have failure messageRyuta Kamizono2018-05-135-7/+7
| | | | | | | | | | | | Follow up of #32605.
* | | Merge pull request #29955 from padi/update_actiondispatch_integration_docsRyuta Kamizono2018-05-041-0/+6
|\ \ \ | | | | | | | | | | | | | | | | Updates documentation on ActionDispatch::Integration::Session#process [ci skip]
| * | | Updates (rdoc) documentation on ActionDispatch::Integration::Session#processMarc Rendl Ignacio2017-07-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Adds missing information on 2 parameters: +xhr+ and +as+ [ci skip]
* | | | Add support for prefetch-src directiveyuuji.yaginuma2018-05-032-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Specification: https://w3c.github.io/webappsec-csp/#directive-prefetch-src This directive can already be used as an experimental feature in Chrome. Ref: https://bugs.chromium.org/p/chromium/issues/detail?id=801561
* | | | Merge pull request #32773 from eugeneius/content_length_multiple_requestsGeorge Claghorn2018-04-302-0/+9
|\ \ \ \ | | | | | | | | | | Reset CONTENT_LENGTH between test requests
| * | | | Reset CONTENT_LENGTH between test requestsEugene Kenny2018-05-012-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a POST request is followed by a GET request in a controller test, the `rack.input` and `RAW_POST_DATA` headers from the first request will be reset but the `CONTENT_LENGTH` header will leak, leading the request object in the second request to incorrectly believe it has a body.
* | | | | Add quotes to code in rdoc comment in ActionController [ci skip]Eddie Lebow2018-04-301-1/+1
|/ / / / | | | | | | | | | | | | The example code is meant to be a string.
* | | | Break up Journey's scanner testvaidehijoshi2018-04-241-47/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This breaks up the one megatest for Journey's scanner into multiple test cases, which also provides better output when there is a failure in the scanner. Before: ``` ./bin/test test/journey/route/definition/scanner_test.rb Run options: --seed 778 F Failure: ActionDispatch::Journey::Definition::TestScanner#test_tokens [/Users/vaidehijoshi/Code/tilde/rails/actionpack/test/journey/route/definition/scanner_test.rb:57]: --- expected +++ actual @@ -1 +1 @@ -[[:SLASH, "/"], [:LITERAL, "page!!"]] +[[:SLASH, "/"], [:LITERAL, "page!"]] bin/test Users/vaidehijoshi/Code/tilde/rails/actionpack/test/journey/route/definition/scanner_test.rb:14 Finished in 0.090899s, 11.0012 runs/s, 44.0049 assertions/s. 1 runs, 4 assertions, 1 failures, 0 errors, 0 skips ``` After: ``` ./bin/test test/journey/route/definition/scanner_test.rb Run options: --seed 2230 ....................F Failure: ActionDispatch::Journey::Definition::TestScanner#test_scanning_/page$ [/Users/vaidehijoshi/Code/tilde/rails/actionpack/test/journey/route/definition/scanner_test.rb:58]: Wrong tokens for `/page$`. --- expected +++ actual @@ -1 +1 @@ -[[:SLASH, "/"], [:LITERAL, "page$$"]] +[[:SLASH, "/"], [:LITERAL, "page$"]] bin/test Users/vaidehijoshi/Code/tilde/rails/actionpack/test/journey/route/definition/scanner_test.rb:56 F Failure: ActionDispatch::Journey::Definition::TestScanner#test_scanning_/page! [/Users/vaidehijoshi/Code/tilde/rails/actionpack/test/journey/route/definition/scanner_test.rb:58]: Wrong tokens for `/page!`. --- expected +++ actual @@ -1 +1 @@ -[[:SLASH, "/"], [:LITERAL, "page!!"]] +[[:SLASH, "/"], [:LITERAL, "page!"]] bin/test Users/vaidehijoshi/Code/tilde/rails/actionpack/test/journey/route/definition/scanner_test.rb:56 F Failure: ActionDispatch::Journey::Definition::TestScanner#test_scanning_/page& [/Users/vaidehijoshi/Code/tilde/rails/actionpack/test/journey/route/definition/scanner_test.rb:58]: Wrong tokens for `/page&`. --- expected +++ actual @@ -1 +1 @@ -[[:SLASH, "/"], [:LITERAL, "page&&"]] +[[:SLASH, "/"], [:LITERAL, "page&"]] bin/test Users/vaidehijoshi/Code/tilde/rails/actionpack/test/journey/route/definition/scanner_test.rb:56 Finished in 0.126447s, 181.8944 runs/s, 181.8944 assertions/s. 23 runs, 23 assertions, 3 failures, 0 errors, 0 skips ```
* | | | Merge pull request #32708 from bdewater/base64-screenshotAndrew White2018-04-241-1/+1
|\ \ \ \ | | | | | | | | | | Use strict_encode64 instead of gsub newline for ScreenshotHelper
| * | | | Use strict_encode64 instead of gsub newline for ScreenshotHelperBart de Water2018-04-231-1/+1
| | | | |
* | | | | Use the same tag as other views to display the error messageyuuji.yaginuma2018-04-231-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since other views use the `h2` tag, should also use `h2` on `missing_exact_template.html.erb`. https://github.com/rails/rails/blob/76acaf6eb9ef3635e4c6f2ca9dba34edb50f541d/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.html.erb#L5 https://github.com/rails/rails/blob/76acaf6eb9ef3635e4c6f2ca9dba34edb50f541d/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.html.erb#L11 https://github.com/rails/rails/blob/76acaf6eb9ef3635e4c6f2ca9dba34edb50f541d/actionpack/lib/action_dispatch/middleware/templates/rescues/unknown_action.html.erb#L5
* | | | Merge pull request #32681 from bdewater/rubocop-0-54Ryuta Kamizono2018-04-222-2/+2
|\ \ \ \ | | | | | | | | | | Rubocop 0.54
| * | | | Fix Style/RedundantReturn offensesBart de Water2018-04-212-2/+2
| | | | |
* | | | | Reset RAW_POST_DATA between test requestsEugene Kenny2018-04-202-4/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | `RAW_POST_DATA` is derived from the `rack.input` header, which changes with each test request. It needs to be cleared in `scrub_env!`, or all requests within the same test will see the value from the first request.
* | | | Merge pull request #29286 from vinistock/create_missing_exact_template_exceptionRafael Mendonça França2018-04-208-20/+44
|\ \ \ \ | | | | | | | | | | | | | | | Create MissingExactTemplate exception with separate template
| * | | | Create MissingExactTemplate exception with separate templateVinicius Stock2018-04-207-20/+37
| | | | |
* | | | | Merge pull request #32665 from albertoalmagro/fix-typos-filter-parametersRafael França2018-04-201-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix typos related to ActionDispatch::Http::FilterParameters
| * | | | | [ci skip] Fix doc typos ActionDispatch::Http::FilterParametersAlberto Almagro2018-04-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes two documentation typos found at ActionDispatch::Http::FilterParameters
* | | | | | Merge pull request #23868 from gsamokovarov/debug-exceptions-interceptorsRafael França2018-04-203-1/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | Introduce ActionDispatch::DebugExceptions interceptors
| * | | | | | Introduce ActionDispatch::DebugExceptions interceptorsGenadi Samokovarov2018-04-203-1/+59
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plugins interacting with the exceptions caught and displayed by ActionDispatch::DebugExceptions currently have to monkey patch it to get the much needed exception for their calculation. With DebugExceptions.register_interceptor, plugin authors can hook into DebugExceptions and process the exception, before being rendered. They can store it into the request and process it on the way back of the middleware chain execution or act on it straight in the interceptor. The interceptors can be play blocks, procs, lambdas or any object that responds to `#call`.
* / / / / / warning: ambiguous first argument; put parentheses or a space even after `/' ↵utilum2018-04-201-1/+1
|/ / / / / | | | | | | | | | | | | | | | operator
* | | | | Revert "Merge pull request #32652 from ↵Rafael Mendonça França2018-04-191-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/add-missing-changelog-for-32593" This reverts commit 78ff47f3e77925f72d98579da6feb68f36052ad8, reversing changes made to daffe03308bffc43ea343a886aab33082d83bb9c. That changelog entry should only be on 5-2-stable
* | | | | Add missing changelog entrybogdanvlviv2018-04-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/pull/32593 was backported to `5-2-stable` but since 5.2.0 is released the changelog entry should be in Rails 6.0.0 too. [ci skip]
* | | | | Merge pull request #32636 from yhirano55/improve_line_tasksRafael França2018-04-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Improve redundancy in line tasks
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 06:01:34 +0000