aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Preparing for 6.0.0.beta2 releaseRafael Mendonça França2019-02-252-1/+3
| | | | |
* | | | | Merge pull request #35400 from aglushkov/stream_manual_cache_controlAaron Patterson2019-02-252-2/+8
|\ \ \ \ \ | | | | | | | | | | | | Allow custom cache-control header in AC::Live
| * | | | | Allow custom cache-control header in AC::LiveAndrey Glushkov2019-02-252-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/issues/35312
* | | | | | Always pass a format to the ActionView::Template constructorAaron Patterson2019-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means we can eliminate nil checks and remove some mutations from the `decorate` method.
* | | | | | Restore UploadedFile compatibility with IO.copy_streamJanko Marohnić2019-02-232-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://github.com/rails/rails/pull/28676 the `#to_path` method was added to `ActionDispatch::Http::UploadedFile`. This broke usage with `IO.copy_stream`: source = ActionDispatch::Http::UploadedFile.new(...) IO.copy_stream(source, destination) # ~> TypeError: can't convert ActionDispatch::Http::UploadedFile to IO (ActionDispatch::Http::UploadedFile#to_io gives Tempfile) Normally `IO.copy_stream` just calls `#read` on the source object. However, when `#to_path` is defined, `IO.copy_stream` calls `#to_io` in order to retrieve the raw `File` object. In that case it trips up, because `ActionDispatch::Http::UploadedFile#to_io` returned a `Tempfile` object, which is not an `IO` subclass. We fix this by having `#to_io` return an actual `File` object.
* | | | | | Test ActionDispatch::Http::UploadedFile with an actual TempfileJanko Marohnić2019-02-231-48/+48
| |_|/ / / |/| | | |
* | | | | Merge pull request #35293 from rails/remove-rendered-format-from-cacheAaron Patterson2019-02-192-12/+15
|\ \ \ \ \ | | | | | | | | | | | | Pass the template format to the digestor
| * | | | | Pass the template format to the digestorAaron Patterson2019-02-152-12/+15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit passes the template format to the digestor in order to come up with a key. Before this commit, the digestor would depend on the side effect of the template renderer setting the rendered_format on the lookup context. I would like to remove that mutation, so I've changed this to pass the template format in to the digestor. I've introduced a new instance variable that will be alive during a template render. When the template is being rendered, it pushes the current template on to a stack, setting `@current_template` to the template currently being rendered. When the cache helper asks the digestor for a key, it uses the format of the template currently on the stack.
* / / / / appropriate typo fixalkesh262019-02-191-1/+1
|/ / / /
* | | | AbstractController::Translation#t: dup optionsNazar Matus2019-02-151-0/+1
| | | |
* | | | Merge pull request #35229 from rails/fix-35222Aaron Patterson2019-02-131-2/+2
|\ \ \ \ | |/ / / |/| | | Convert lookup context's to a stack for fixing #35222 and #34138
| * | | Turn lookup context in to a stack, push and pop if formats changeAaron Patterson2019-02-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit keeps a stack of lookup contexts on the ActionView::Base instance. If a format is passed to render, we instantiate a new lookup context and push it on the stack, that way any child calls to "render" will use the same format information as the parent. This also isolates "sibling" calls to render (multiple calls to render in the same template). Fixes #35222 #34138
* | | | Merge pull request #35175 from drn/create-sessionGuillermo Iguaran2019-02-122-1/+28
|\ \ \ \ | |/ / / |/| | | Support testing of non-ActionDispatch-routed apps.
| * | | Support testing of non-ActionDispatch-routed apps.Darren Cheng2019-02-052-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The [Grape API framework](https://github.com/ruby-grape/grape) regularly writes tests like [spec/grape/api_spec.rb](https://github.com/ruby-grape/grape/blob/master/spec/grape/api_spec.rb). When attempting to write a test in a Rails environment similar to the following: ``` describe Grape::Api, type: :request do let(:app) { Class.new(Grape::API) do get 'test' do { foo: 'bar' } end end } it '200s' do get 'test' end end ``` The following exception is thrown: ``` NoMethodError: undefined method `url_helpers' for #<Array:0x00007fb4e4bc4c88> -- 0: .../lib/action_dispatch/testing/integration.rb:330:in `block in create_session' 1: .../lib/action_dispatch/testing/integration.rb:326:in `initialize' 2: .../lib/action_dispatch/testing/integration.rb:326:in `new' 3: .../lib/action_dispatch/testing/integration.rb:326:in `create_session' 4: .../lib/action_dispatch/testing/integration.rb:316:in `integration_session' 5: .../lib/action_dispatch/testing/integration.rb:348:in `block (2 levels) in <module:Runner>' ``` This change explicitly ensures that `app.routes` is an `ActionDispatch::Routing::RouteSet` instance.
* | | | Merge pull request #35036 from rails/av-base-subclassAaron Patterson2019-02-061-0/+4
|\ \ \ \ | |/ / / |/| | | Move compiled ERB to an AV::Base subclass
| * | | Pull generated methods up in to the anonymous subclassAaron Patterson2019-02-061-6/+1
| | | | | | | | | | | | | | | | Then we don't need the extra module.
| * | | Move templates to an anonymous subclass of AV::BaseAaron Patterson2019-02-061-0/+9
| | | | | | | | | | | | | | | | | | | | Now we can throw away the subclass and the generated methods will get GC'd too
* | | | Update terminal-to-html inline images url in ScreenshotHelperbetterzega2019-02-051-1/+1
| | | |
* | | | Merge pull request #35162 from silppuri/fix-incorrectly-matching-unachored-pathsAaron Patterson2019-02-053-12/+18
|\ \ \ \ | |/ / / |/| | | Fix incorrectly matching unanchored paths
| * | | Restrict matching with word boundary or end of stringPetri Avikainen2019-02-052-12/+12
| | | |
| * | | Define word boundary for unanchored path regexpPetri Avikainen2019-02-053-12/+18
| | | |
* | | | Respect ENV variables when finding DBs etc for the test suiteMatthew Draper2019-02-061-3/+6
| | | | | | | | | | | | | | | | | | | | If they're not set we'll still fall back to localhost, but this makes it possible to run the tests against a remote Postgres / Redis / whatever.
* | | | Merge pull request #35139 from 7coAim/fix_debug_exceptionsGeorge Claghorn2019-02-053-2/+6
|\ \ \ \ | | | | | | | | | | Fix NameError : Make debug exceptions works in an environment where ActiveStorage is not loaded.
| * | | | fix NameErrorkurosawat2019-02-053-2/+6
| | | | | | | | | | | | | | | | | | | | NameError: uninitialized constant ActionView::CompiledTemplates::ActiveStorage
* | | | | Merge pull request #35134 from Edouard-chin/ec-cookie-expiry-regressionRafael França2019-02-042-16/+4
|\ \ \ \ \ | | | | | | | | | | | | Cookie doesn't expire anymore unless a flag is set:
| * | | | | Cookie doesn't expire anymore unless a flag is set:Edouard CHIN2019-02-042-16/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - There is a regression in 6.0 introduced by #32937 where cookie doesn't expire anymore unless the new `use_cookies_with_metadata` configuration is set to `true`. This causes issue for app migration from 5.2 to 6.0 because the `use_cookies_with_metadata` flag can't be set to true until all servers are running on 6.0. Here is a small reproduction script that you can run in the console ```ruby ActionDispatch::Cookies request = ActionDispatch::Request.empty request.env["action_dispatch.key_generator"] = ActiveSupport::KeyGenerator.new('1234567890') request.env["action_dispatch.signed_cookie_salt"] = 'signed cookie' request.env["action_dispatch.cookies_rotations"] = ActiveSupport::Messages::RotationConfiguration.new request.env["action_dispatch.use_authenticated_cookie_encryption"] = true signed_cookie = request.cookie_jar.signed signed_cookie[:foobar] = { value: '123', expires: 1.day.ago } p signed_cookie[:foobar] ```
* | | | | Merge pull request #35086 from gsamokovarov/cleanup-whitelisting-refsGannon McGibbon2019-02-043-6/+6
|\ \ \ \ \ | |_|/ / / |/| | | | Cleanup the whitelisting references after #33145
| * | | | Cleanup the whitelisting references after #33145Genadi Samokovarov2019-02-033-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the development of #33145, I have named a few concepts in the code as `whitelisted`. We decided to stay away from the term and I adjusted most of the code afterwards, but here are the cases I forgot to change. I also found a case in the API guide that we could have cleaned up as well. [ci skip]
* | | | | Use consistent hash syntax for routesAndy Waite2019-02-011-14/+14
| |/ / / |/| | | | | | | | | | | [ci skip]
* | | | Fix doc of `ActionDispatch::SystemTestCase` [ci skip]yuuji.yaginuma2019-02-011-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | * Fix broken format. * Need to specify driver to the first argument of `driven_by`. * `add_emulation` doesn't have `device` keyword. Ref: https://github.com/SeleniumHQ/selenium/blob/master/rb/lib/selenium/webdriver/chrome/options.rb#L142-L162
* | | | Merge pull request #35093 from rails/av-base-constructorAaron Patterson2019-01-302-2/+4
|\ \ \ \ | | | | | | | | | | Tighten up the AV::Base constructor
| * | | | Tighten up the AV::Base constructorAaron Patterson2019-01-292-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AV::Base constructor was too complicated, and this commit tightens up the parameters it will take. At runtime, AV::Base is most commonly constructed here: https://github.com/rails/rails/blob/94d54fa4ab641a0ddeb173409cb41cc5becc02a9/actionview/lib/action_view/rendering.rb#L72-L74 This provides an AV::Renderer instance, a hash of assignments, and a controller instance. Since this is the common case for construction, we should remove logic from the constructor that handles other cases. This commit introduces special constructors for those other cases. Interestingly, most code paths that construct AV::Base "strangely" are tests.
* | | | | Remove unused codebogdanvlviv2019-01-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove `fragment_cache_key` helper declaration. It was removed in e70d3df7c9b05c129b0fdcca57f66eca316c5cfc - Remove `by_private_lifo`. It is unused since a7becf147afc85c354e5cfa519911a948d25fc4d
* | | | | Add `require "selenium/webdriver"` to all using `DrivenBySeleniumWith*` classesRyuta Kamizono2019-01-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/486285170#L1349-L1366 ``` % git grep -n DrivenBySeleniumWith test/abstract_unit.rb:374:class DrivenBySeleniumWithChrome < ActionDispatch::SystemTestCase test/abstract_unit.rb:378:class DrivenBySeleniumWithHeadlessChrome < ActionDispatch::SystemTestCase test/abstract_unit.rb:382:class DrivenBySeleniumWithHeadlessFirefox < ActionDispatch::SystemTestCase test/dispatch/system_testing/screenshot_helper_test.rb:10: new_test = DrivenBySeleniumWithChrome.new("x") test/dispatch/system_testing/screenshot_helper_test.rb:18: new_test = DrivenBySeleniumWithChrome.new("x") test/dispatch/system_testing/screenshot_helper_test.rb:28: new_test = DrivenBySeleniumWithChrome.new("x") test/dispatch/system_testing/screenshot_helper_test.rb:40: new_test = DrivenBySeleniumWithChrome.new("x") test/dispatch/system_testing/screenshot_helper_test.rb:48: new_test = DrivenBySeleniumWithChrome.new("x") test/dispatch/system_testing/screenshot_helper_test.rb:62: new_test = DrivenBySeleniumWithChrome.new("x") test/dispatch/system_testing/screenshot_helper_test.rb:76:class SeleniumScreenshotsTest < DrivenBySeleniumWithChrome test/dispatch/system_testing/system_test_case_test.rb:11:class OverrideSeleniumSubclassToRackTestTest < DrivenBySeleniumWithChrome test/dispatch/system_testing/system_test_case_test.rb:19:class SetDriverToSeleniumTest < DrivenBySeleniumWithChrome test/dispatch/system_testing/system_test_case_test.rb:25:class SetDriverToSeleniumHeadlessChromeTest < DrivenBySeleniumWithHeadlessChrome test/dispatch/system_testing/system_test_case_test.rb:31:class SetDriverToSeleniumHeadlessFirefoxTest < DrivenBySeleniumWithHeadlessFirefox test/dispatch/system_testing/system_test_case_test.rb:49:class UndefMethodsTest < DrivenBySeleniumWithChrome ```
* | | | | selenium-webdriver is not always required for system testingRyuta Kamizono2019-01-302-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But `NameError: uninitialized constant ActionDispatch::SystemTesting::Browser::Selenium` is pretty confused. I've little improved missing constant error to `NameError: uninitialized constant Selenium`.
* | | | | Fix system testing failureRyuta Kamizono2019-01-302-8/+13
|/ / / / | | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/486155626#L1317-L1335
* | | | Rename methods and update docsEileen Uchitelle2019-01-293-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a minor update to the named methods for the following: - s/desired_capabilities/capabilities - s/driver_options/capabilities Since they are all the same thing we should keep the name the same throughout the feature. Updated docs to match / be a little bit clearer Also updated the Gemfile for selenium-webdriver.
* | | | driver_option -> driver_optionsEdouard CHIN2019-01-293-8/+9
| | | |
* | | | Implement a way to add browser capabilities:Edouard CHIN2019-01-295-11/+113
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * There is currently no way to define specific browser capabilities since our SystemTest driver override the `option` key [Ref](https://github.com/rails/rails/blob/a07d0680787ced3c04b362fa7a238c918211ac70/actionpack/lib/action_dispatch/system_testing/driver.rb#L35) This option key is used internally by selenium to add custom capabilities on the browser. Depending on the Browser, some option are allowed to be passed inside a hash, the driver takes care of setting whatever you passed on the driver option. An example [here](https://github.com/rails/rails/blob/a07d0680787ced3c04b362fa7a238c918211ac70/actionpack/lib/action_dispatch/system_testing/driver.rb#L35) where you are allowed to pass args such as `--no-sandbox` etc However this behavior was only meant for backward compatibility and as you can see it's deprecated. The non-deprecated behavior is to create a `<Driver>::Option` object containing all the capabilities we want. This is what we [currently do](https://github.com/rails/rails/blob/a07d0680787ced3c04b362fa7a238c918211ac70/actionpack/lib/action_dispatch/system_testing/browser.rb#L34-L36) when chrome or firefox are in headless mode. This PR allows to pass a block when calling `driven_by`, the block will be pased a `<Driver>::Option` instance. You can modify this object the way you want by adding any capabilities. The option object will be then passed to selenium. ```ruby driven_by :selenium, using: :chrome do |driver_option| driver_option.add_argument('--no-sandbox') driver_option.add_emulation(device: 'iphone 4') end ```
* | | Merge pull request #35030 from ↵Rafael França2019-01-282-2/+2
|\ \ \ | | | | | | | | | | | | | | | | alkesh26/actionpack-long-string-indentation-and-typo-fix Actionpack typo fixes.
| * | | Typo fixes action pack.alkesh262019-01-262-2/+2
| | | |
* | | | Merge pull request #35054 from bogdanvlviv/exercise-redirect_backRyuta Kamizono2019-01-261-0/+29
|\ \ \ \ | | | | | | | | | | Ensure that `redirect_back` with `fallback_location` to another host is allowed
| * | | | Ensure that `redirect_back` with `fallback_location` to another host is allowedbogdanvlviv2019-01-251-0/+29
| |/ / / | | | | | | | | | | | | I would like to add those tests to prevent regression.
* | | | Loosen check of error cause fileyuuji.yaginuma2019-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | Since "actionpack" is not included in isolation test. Ref: https://travis-ci.org/rails/rails/jobs/484514392#L2715
* | | | Fixed a bug where the debug view does not show the error page properlyYuki Nishijima2019-01-243-13/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two cases where the debug view does not show the error details properly: * When the cause is mapped to an HTTP status code the last exception is unexpectedly uwrapped * When the last error is thrown from a view template the debug view is not using the `rescues/template_error.html.erb` to generate the view Both the cases could be fixed by not unwrapping the exception. The only case where the exception should be unwrapped is when the last error is an `ActionView::Template::Error` object. In this case the HTTP status code is determined based on the cause. There are actually more wrapper exceptions that are intentionally thrown. However, there is a consistent pattern of setting the original message and original backtrace to the wrapper exception implemented, so the debug view will not lose the information about what went wrong eariler.
* | | | Merge pull request #34994 from schuetzm/host-authorization-only-in-developmentRafael França2019-01-242-4/+4
|\ \ \ \ | | | | | | | | | | Recommend adding the requested domain to hosts whitelist only in deve…
| * | | | Recommend adding the requested domain to hosts whitelist only in developmentMarc Schütz2019-01-232-4/+4
| | | | |
* | | | | Prefer strings over regex expressionsYuki Nishijima2019-01-241-22/+20
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this case statement, there are two patterns that start with the same line: when %r{/not_found} ... when %r{/not_found_original_exception} ... Because the string "/not_found_original_exception" does match the first one, it is never routed to what it is supposed to be routed, causing one of the tests for DebugExceptions to happen to be passing. After changing the regex expressions back to strings, I noticed that the test setup is not complete (the template object needs to be a proper template object). Once I fixed it all the tests started padding.
* | | | Merge pull request #35018 from gmcgibbon/revert_redirect_to_allow_other_hostRafael França2019-01-226-77/+19
|\ \ \ \ | | | | | | | | | | Revert ensure external redirects are explicitly allowed
| * | | | Revert ensure external redirects are explicitly allowedGannon McGibbon2019-01-226-77/+19
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 00:45:07 +0000