aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Fix `make_response!` when called by `serve` in `RouteSet`eileencodes2015-12-092-6/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of our tests were testing the `ActionController::Live` behavior in a standalone environment, without going through the router or behaving like a real application. This resulted in `ActionController::Live` throwing the exception `undefined method 'request' for #<ActionDispatch::Request:0x00000003ad1148>` because `make_response!` was expecting a response instead of a request. The expectation of a response came from `set_response!` in non-router tests setting the response and passing it to `make_response!`. In the case of an application we would hit `serve` in `RouteSet` first which would send us to `make_response!` with a request sent instead of a response. The changes here remove `set_response!` so `make_response!` always receives a request. Thanks to KalabiYau for help with the investigation and solution. Fixes #22524 [Eileen M. Uchitelle & KalabiYau]
* | | | | renames AS::FileEventedUpdateChecker to AS::EventedFileUpdateCheckerXavier Noria2015-12-093-6/+6
|/ / / / | | | | | | | | | | | | Better English.
* | | | Merge pull request #22248 from arekf/issue-22232Kasper Timm Hansen2015-12-072-1/+10
|\ \ \ \ | | | | | | | | | | Fix #22232: rake test tasks exit status code
| * | | | Fix #22232: rake test tasks exit status codeArkadiusz Fal2015-12-072-1/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | The exit status code was not set when tests were fired with `rake`. Now, it is being set and it matches behavior of running tests via `rails` command (`rails test`), so no matter if `rake test` or `rails test` command is used the exit code will be set.
* | | | Clarify the need to run command twice.Kasper Timm Hansen2015-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | We had 2 pull requests erronously trying to remove the first command. Add some comments for clarity.
* | | | Change the `protect_from_forgery` prepend default to `false`eileencodes2015-12-073-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per this comment https://github.com/rails/rails/pull/18334#issuecomment-69234050 we want `protect_from_forgery` to default to `prepend: false`. `protect_from_forgery` will now be insterted into the callback chain at the point it is called in your application. This is useful for cases where you want to `protect_from_forgery` after you perform required authentication callbacks or other callbacks that are required to run after forgery protection. If you want `protect_from_forgery` callbacks to always run first, regardless of position they are called in your application, then you can add `prepend: true` to your `protect_from_forgery` call. Example: ```ruby protect_from_forgery prepend: true ```
* | | | Merge pull request #22508 from ↵Santiago Pastorino2015-12-072-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | y-yagi/remove_request_forgery_protection_from_rails_api remove `request_forgery_protection` initializer from rails api
| * | | | remove `request_forgery_protection` initializer from rails apiyuuji.yaginuma2015-12-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | In rails api, since default is so as not to use the `protect_from_forgery`, `request_forgery_protection` initializer I think that's unnecessary
* | | | | Merge pull request #22475 from claudiob/missing-requireMatthew Draper2015-12-081-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add missing require to strong_parameters.rb
| * | | | | Add missing require to strong_parameters.rbclaudiob2015-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file [references Rack::Test here](https://github.com/rails/rails/blame/master/actionpack/lib/action_controller/metal/strong_parameters.rb#L671) so it's better off requiring 'rack/test' in the first place.
* | | | | | Merge pull request #22523 from Elektron1c97/masterRafael França2015-12-071-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Typo correction
| * | | | | | Typo correctionYves Siegrist2015-12-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the doc the `dependent` option was set with: `dependent: destroy`. This is not working because destroy would call the method of the activerecord::base object. The right way is: `dependent: :destroy`
* | | | | | | Merge pull request #22517 from Elektron1c97/masterRafael França2015-12-077-13/+7
|\| | | | | | | | | | | | | | | | | | | | [ci skip] Add a dollar sign to each command in the READMEs
| * | | | | | [ci skip] Add a dollar sign to each command in the READMEsElektron1c972015-12-067-13/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to pr #22443 in the guides there's always a dollar sign before every command, so why is in the main README a `$` and in every submodule a `%`? Just eye candy..
* | | | | | Make sure we touch all the parents when touch_later.Arthur Neves2015-12-064-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that when saving an object, we would call touch_later on the parent which wont be saved immediteally, and it wont call any callbacks. That was working one level up because we were calling touch, during the touch_later commit phase. However that still didnt solve the problem when you have a 3+ levels of parents to be touched, as calling touch would affect the parent, but it would be too late to run callbacks on its grand-parent. The solution for this, is instead, call touch_later upwards when the first touch_later is called. So we make sure all the timestamps are updated without relying on callbacks. This also removed the hard dependency BelongsTo builder had with the TouchLater module. So we can still have the old behaviour if TouchLater module is not included. [fixes 5f5e6d924973003c105feb711cefdb726f312768] [related #19324]
* | | | | | Only commit the cookie jar if it hasn't been committedeileencodes2015-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to commit the cookie jar more than once because then we will be attempting to modify a frozen hash. Fixes Railties test failure caused by 492b134.
* | | | | | Stop violating law of demeter in response cookie_jareileencodes2015-12-063-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new method to request and response so we don't need to violate the law of demeter. We are changing `Request` and `Response` so that they always have a `cookie_jar` This is a continuation on work to combine integration and controller test code bases in Rails.
* | | | | | Push `before_sending` to super classeileencodes2015-12-0610-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to get rid of the `Live::Response` so we are consolidating methods from `Live::Response` and `Response` by merging them together. This adds an `#empty` method to the request so we don't need to hard-code the empty array each time we call an empty `ActionDispatch::Request`. The work here is a continuation on combining controller and integration test code bases into one.
* | | | | | Merge pull request #22516 from gsamokovarov/after-create-update-destroy-commitDavid Heinemeier Hansson2015-12-064-6/+63
|\ \ \ \ \ \ | | | | | | | | | | | | | | Introduce after_{create,update,delete}_commit callbacks
| * | | | | | Introduce after_{create,update,delete}_commit callbacksGenadi Samokovarov2015-12-064-6/+63
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those are actually shortcuts for `after_commit`. Before: after_commit :add_to_index_later, on: :create after_commit :update_in_index_later, on: :update after_commit :remove_from_index_later, on: :destroy After: after_create_commit :add_to_index_later after_update_commit :update_in_index_later after_destroy_commit :remove_from_index_later
* | | | | | Merge pull request #22428 from thedarkone/subs-notifEileen M. Uchitelle2015-12-063-4/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Subscribing to notifications while inside the said instrumented section
| * | | | | | Subscribing to notifications while inside the said instrumented section.thedarkone2015-11-283-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue is that on the exit from Instrumenter#instrument section, an Evented listener will run into an error because its thread local (Thread.current[:_timestack]) has not been set up by the #start method (this obviously happens because the Evented listeners didn't exist at the time, since no subscribtion to that section was made yet). Note: support for subscribing to instrumented sections, while being inside those instrumented sections, might be removed in the future. Maybe fixes #21873.
* | | | | | | Merge pull request #22453 from wjessop/use_action_dispatch_default_tld_lengthEileen M. Uchitelle2015-12-061-26/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Test against the real value of tld_length unless explicitly set
| * | | | | | | Test against the real value of tld_length unless explicitly setWill Jessop2015-12-041-26/+30
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two places where the tld_length default was hard-coded to 1, both overriding the real default value of ActionDispatch::Http::URL.tld_length in this set of tests. This commit removes both of those, relying on the actual value of ActionDispatch::Http::URL.tld_length, unless it's specifically overridden.
* | | | | | | Merge pull request #22480 from keepcosmos/add-translate-testEileen M. Uchitelle2015-12-061-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add test for namespaced model name translation
| * | | | | | | add test for nested model translationkeepcosmos2015-12-031-0/+5
| | | | | | | |
* | | | | | | | Ditch `Commands` namespace for base command.Kasper Timm Hansen2015-12-064-83/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reading `Rails::Commands::Command` feels excessive. Especially if users can subclass command to write their own commands — which I'd like to aim for. Switch to `Rails::Command` before we get too far into things.
* | | | | | | | Invert command and commands tasks reference.Kasper Timm Hansen2015-12-063-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should first attempt to run commands through Rails command, and then fall back to trying the commands tasks. Because eventually the commands tasks should be their own commands.
* | | | | | | | Remove "run with rake" suggestion.Kasper Timm Hansen2015-12-061-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When attempting to run a `rake` task with `bin/rails`, Rails would see check that a Rake task existed and ask users if they meant to run it with rake. We don't need that anymore, as the goal is to have `rails` be a valid way to run rake tasks.
* | | | | | | | Add class level `run` to Rails command.Kasper Timm Hansen2015-12-062-22/+15
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class level version is responsible for changing a task name to command name, then finding a command and run it if there is one. The instance level `run` then makes sure arguments have been parsed into `@options` and runs the command by sending it. `Rails::Commands::Command.run` returns true to make it work within `Rails::CommandsTask`, but won't in the future when it handles all option parsing.
* | | | | | | Merge pull request #19977 from ↵Arthur Nogueira Neves2015-12-052-1/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/mention-redirect-path-in-assert-response Add redirection path in the error message of assert_response if response is :redirect
| * | | | | | | Add redirection path in the error message of assert_response if response is ↵Prathamesh Sonpatki2015-12-042-1/+31
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :redirect - If the assert_response is checking for any non-redirect response like :success and actual response is :redirect then, the error message displayed was - Expected response to be a <success>, but was <302> - This commit adds the redirect path to the error message of assert_response if the response is :redirect. So above message is changed to - Expected response to be a <success>, but was a redirect to <http://test.host/posts/lol>
* | | | | | | Replace `-> {}` with a proc.Kasper Timm Hansen2015-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `parse_options_for` was called for a command that hadn't set up any option parsing with `options_for`, the `call` method would be sent to `-> {}`, which didn't like to be passed two arguments. Switch to `proc {}` which can accept several arguments.
* | | | | | | Merge pull request #22202 from grosser/grosser/write-consistentArthur Nogueira Neves2015-12-052-4/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | even if a write fails, store the raw value
| * | | | | | | even if a write fails, store the raw valueMichael Grosser2015-11-292-4/+12
| | | | | | | |
* | | | | | | | Remove `_instance` suffix from command.Kasper Timm Hansen2015-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I want to streamline the wording around `command`, and not start pondering about instances.
* | | | | | | | Default `argv` to an empty array.Kasper Timm Hansen2015-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ARGV` constant in Ruby is not a string, it's an array as demonstrated by running: ``` $ ruby -e "p ARGV" => [] $ $ ruby -e "p ARGV" test/file.rb --version=2 => ["test/file.rb", "--version=2"] ```
* | | | | | | | Spruce up `command_for`.Kasper Timm Hansen2015-12-051-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ditch the instance methods local variable. * Prefer Ruby's default nil return, and remove else branch.
* | | | | | | | `exists?` isn't for users.Kasper Timm Hansen2015-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking that a command exists before running it is an implementation detail of the Rails command and Rake task world right now. Eventually I'd like to get rid of `exists?`, when I've worked out another way to fall back to run the old tasks.
* | | | | | | | Move `command_name_for` to private section.Kasper Timm Hansen2015-12-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users shouldn't have to lookup the command name for a task. Put it in the private section, so it doesn't show up in any generated documentation.
* | | | | | | | Shrink a couple of deprecation warnings to one-linersMatthew Draper2015-12-061-18/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous spelling seemed a bit too generous with the whitespace, and looked out of place when amongst others.
* | | | | | | | Merge pull request #22492 from RochesterinNYC/patch-1Sean Griffin2015-12-052-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add note about serialization to update_columns documentation [ci skip]
| * | | | | | | | Clean up and correct documentation for update_columns and update_all [ci skip]James Wen2015-12-052-3/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #22500 from y-yagi/fix_warning_in_geometric_testSean Griffin2015-12-041-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | remove warning from postgresql geometric test
| * | | | | | | | remove warning from postgresql geometric testyuuji.yaginuma2015-12-051-1/+3
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warning which has been out in the case of a PostgreSQL 9.3 below. ``` activerecord/test/cases/adapters/postgresql/geometric_test.rb:265: warning: instance variable @connection not initialized ```
* | | | | | | | Merge pull request #22457 from ccallebs/rails-commands-infrastructureKasper Timm Hansen2015-12-059-51/+144
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Add Rails command infrastructure
| * | | | | | | Add Rails command infrastructure and encapsulate development cachingChuck Callebs2015-12-049-51/+144
|/ / / / / / /
* | | | | | | Merge pull request #22482 from ridiculous/masterRafael França2015-12-041-4/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Replace ActionMailer::Base.respond_to? with respond_to_missing?
| * | | | | | | Make ActionMailer::Base.respond_to_missing? privateRyan Buckley2015-12-031-4/+6
| | | | | | | |
| * | | | | | | Replace ActionMailer::Base#respond_to? with respond_to_missing?Ryan Buckley2015-12-021-2/+2
| | |_|/ / / / | |/| | | | |