aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Don't skip in-memory insertion of associations when loaded in validateSean Griffin2016-09-294-16/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by 6d0d83a33f59d9415685852cf77818c41e2e2700. While the bug it's trying to fix is handled if the association is loaded in an after_(create|save) callback, it doesn't handle any cases that load the association before the persistence takes place (validation, or before_* filters). Instead of caring about the timing of persistence, we can just ensure that we're not double adding the record instead. The test from that commit actually broke, but it was not because the bug has been re-introduced. It was because `Bulb` in our test suite is doing funky things that look like STI but isn't STI, so equality comparison didn't happen as the loaded model was of a different class. Fixes #26661.
* | | | | Merge pull request #26660 from unasuke/fix_typo_in_5_0_release_notesVipul A M2016-09-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in 5_0_release_notes.md doc [ci skip]
| * | | | | Fix typo in 5_0_release_notes.md doc [ci skip]Yusuke Nakamura2016-09-291-1/+1
|/ / / / /
* | | | | Merge pull request #26659 from y-yagi/remove_mongrel_once_againKasper Timm Hansen2016-09-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | remove `mongrel` once again
| * | | | | remove `mongrel` once againyuuji.yaginuma2016-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `mongrel` was removed in #26408. But have back accidentally in #26414.
* | | | | | Merge pull request #26402 from mtsmfm/remove-dead-constantsAkira Matsuda2016-09-291-30/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove dead constants
| * | | | | Remove dead constantsFumiaki MATSUSHIMA2016-09-061-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | It seems that we forgot to remove some codes on https://github.com/rails/rails/commit/7ab47751068c6480e7e44fc9265a7e690dd4af3b
* | | | | | Merge pull request #26648 from y-yagi/update_description_of_queue_adapterJon Moss2016-09-281-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | update description of queue adapter in test [ci skip]
| * | | | | | update description of queue adapter in test [ci skip]yuuji.yaginuma2016-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveJob::TestCase` set `TestAdapter` to queue adapter at `before_setup`. https://github.com/rails/rails/blob/master/activejob/lib/active_job/test_helper.rb#L12..L21
* | | | | | | Merge pull request #26654 from Neodelf/activesupport_1Jon Moss2016-09-281-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Remove not necessary whitespace
| * | | | | | | [ci skip] Remove not necessary whitespaceAndrey Molchanov2016-09-281-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #26653 from Neodelf/new_branch_nameJon Moss2016-09-281-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip] Use right format text
| * | | | | | | | [ci skip] Use right format textAndrey Molchanov2016-09-281-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #26652 from Neodelf/activesupport_2Jon Moss2016-09-281-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | [ci skip] Use class name instead of path to file
| * | | | | | | | [ci skip] Use class name instead of path to fileAndrey Molchanov2016-09-281-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #26649 from michaellennox/remove_broken_perf_test_linkप्रथमेश Sonpatki2016-09-281-1/+0
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | [ci skip] Removes broken performance testing link from the 2.2 release notes
| * | | | | | | Removes broken performance testing link from the 2.2 release notesMichael Lennox2016-09-281-1/+0
|/ / / / / / /
* | | | | | | Merge pull request #26637 from y-yagi/prevent_plugin_test_run_twiceKasper Timm Hansen2016-09-272-1/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | use `active_support/testing/autorun` in `bin/test` script
| * | | | | | | use `active_support/testing/autorun` in `bin/test` scriptyuuji.yaginuma2016-09-272-1/+9
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29f0fbd5db643b885665e4a14c7de3bf6c0d9c96 has changed that always call `Minitest.autorun` in `active_support/testing/autorun`. Therefore, when used directly `Minitest.run`, tests are performed twice.
* | | | | | | Merge pull request #26573 from kirs/action-controller-as-formatRafael França2016-09-272-4/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make :as option also set request format (AC::TestCase)
| * | | | | | | Make :as option also set request format (AC::TestCase)Kir Shatrov2016-09-212-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | right now you'd have to specify both :as and :format: ``` post :create, params: { foo: "bar" } as: :json, format: :json ```
* | | | | | | | Merge pull request #26640 from Shopify/fix-am-errors-to-hash-default-procRafael França2016-09-272-1/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Do not leak the Errors default proc when calling to_hash or as_json
| * | | | | | | | Do not leak the Errors default proc when calling to_hash or as_jsonJean Boussier2016-09-272-1/+11
|/ / / / / / / /
* | | | | | | | Merge pull request #26636 from y-yagi/fix_typo_in_all_weekप्रथमेश Sonpatki2016-09-271-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix typo in `DateAndTime::Calculations#all_week` doc [ci skip]
| * | | | | | | | fix typo in `DateAndTime::Calculations#all_week` doc [ci skip]yuuji.yaginuma2016-09-271-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Date.week_start` does not exist. `Date.beginning_of_week` seems to be correct. Ref: #5339
* | | | | | | | Merge pull request #26629 from kamipo/fix_doc_formatJon Moss2016-09-261-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix doc format for `RecordFetchWarning` [ci skip]
| * | | | | | | Fix doc format for `RecordFetchWarning` [ci skip]Ryuta Kamizono2016-09-271-3/+3
| | | | | | | |
* | | | | | | | Merge pull request #26414 from rails/rails-commandsKasper Timm Hansen2016-09-2638-766/+1005
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Initial Rails Commands Infrastructure
| * | | | | | | | Apply test command changes.Kasper Timm Hansen2016-09-261-1/+3
| | | | | | | | |
| * | | | | | | | Fix server command tests.Kasper Timm Hansen2016-09-251-1/+2
| | | | | | | | |
| * | | | | | | | Fix dbconsole tests.Kasper Timm Hansen2016-09-252-28/+59
| | | | | | | | |
| * | | | | | | | Apply Rafaels review fixes.Kasper Timm Hansen2016-09-253-3/+4
| | | | | | | | |
| * | | | | | | | Fix console tests.Kasper Timm Hansen2016-09-253-7/+33
| | | | | | | | |
| * | | | | | | | Remove the old command files.Kasper Timm Hansen2016-09-2514-880/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wash out your old! These adhoc scripts are replaced by the new commands.
| * | | | | | | | Per Dr. Eileen's orders :)Kasper Timm Hansen2016-09-253-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prescribed some review fixes for myself!
| * | | | | | | | Simplify auxiliary command files directory finding.Kasper Timm Hansen2016-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still vulnerable to different file structures. We likely want something more robust when we tackle in app commands.
| * | | | | | | | Run engine commands through command infrastructure.Kasper Timm Hansen2016-09-256-14/+54
| | | | | | | | |
| * | | | | | | | Initial command structure.Kasper Timm Hansen2016-09-2525-160/+1176
| | | | | | | | |
* | | | | | | | | Use xor to avoid allocations in `AR::Core#hash`Sean Griffin2016-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not as good a solution as actually hashing both values, but Ruby doesn't expose that capability other than allocating the array. Unless we were to do something silly like have a thread local array that is re-used, I don't see any other way to do this without allocation. This solution may not be perfect, but it should reasonably avoid collisions to the extent that we need.
* | | | | | | | | Merge pull request #26626 from alexcameron89/pg_result_docMatthew Draper2016-09-261-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | [ci skip] Update PG adapter documentation
| * | | | | | | | [ci skip] Update PG adapter documentationAlex Kitchens2016-09-261-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per discussion in pull request #26622: "Let's change it to PG::Error. The more specific classes mentioned are subclasses, and the fact the raised exception is a PG::UndefinedColumn doesn't change the fact that it's also a PG::Error." - matthewd
* | | | | | | | Merge pull request #26622 from alexcameron89/pg_result_docJon Moss2016-09-251-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip] Clarify Postgresql Documentation
| * | | | | | | | [ci skip] Clarify Postgresql DocumentationAlex Kitchens2016-09-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This clarifies the object that +ActiveRecord::Base.connection.execute+ will return when using Postgresql.
* | | | | | | | | Merge pull request #26579 from y-yagi/remove_unnecessary_rails_env_settingKasper Timm Hansen2016-09-252-4/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | remove unnecessary `RAILS_ENV` setting
| * | | | | | | | | remove unnecessary `RAILS_ENV` settingyuuji.yaginuma2016-09-222-4/+0
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `RAILS_ENV` is always set in the initialization process of test runner. https://github.com/rails/rails/blob/9fa07095a35be2d8cb5adcc992b988e73a6d9719/railties/lib/rails/test_unit/minitest_plugin.rb#L74 Therefore, it is not necessary to set in `test_helper`.
* | | | | | | | | Merge pull request #26619 from maclover7/jm-a502703-notesJon Moss2016-09-251-0/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Add info about a502703 to Rails 5 release notes
| * | | | | | | | Add info about a502703 to Rails 5 release notesJon Moss2016-09-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Use autorun when running via Rake.Kasper Timm Hansen2016-09-251-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes sure we get support for `Minitest.after_run` hooks and don't accidentally run tests twice. Requires overriding minitest `run` to respect the TESTOPTS variable.
* | | | | | | | | fffffff, Add code missing in 29f0fbdKasper Timm Hansen2016-09-251-2/+2
| | | | | | | | |
* | | | | | | | | Revise setting of run_with_rails_extension.Kasper Timm Hansen2016-09-253-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Rails test runner supports three ways to run tests: directly, via rake, or ruby. When Running with Ruby ala `ruby -Itest test/models/post_test.rb` our test file would be evaluated first, requiring `test_helper` and then `active_support/testing/autorun` that would then require the test file (which it hadn't been before) thus reevaluating it. This caused exceptions if using Active Support's declarative syntax. Fix this by shifting around when we set the how we're run to closer mimick the require order. If we're running with `bin/rails test` the test command file is run first and we then set `run_with_rails_extension`, later we hit `active_support/testing/autorun` and do nothing — because we've been run elsewhere. If we at this point haven't set `run_with_rails_extension` we've been running with `ruby` this whole time and thus we set that. We should always trigger `Minitest.autorun` as it doesn't hurt to call it twice. Consolidate the two methods into a single one that better brings out the intent of why they're there.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 19:07:04 +0000