aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revise credentials diffing flow to use a separate diff commandKasper Timm Hansen2019-08-045-105/+79
| | | | | | | | | | | | | | Didn't like the complicated stuff that happened on credentials:edit. It would append to .gitattributes multiple times. Though I see why it was written that way. I'm cutting off for now, but since this new flow would require each developer to run --enable perhaps this should really be: 1. Developer enrolls Rails app by running `credentials:diff --enable` 2. credentials:edit checks .gitattributes for `diff=rails_credentials` and if the current file is covered by that. 3. If so, set up the "rails_credentials" driver automatically.
* Extract diffing to separate credentials:diff commandKasper Timm Hansen2019-08-043-51/+43
|
* Commands already make fileutils available.Kasper Timm Hansen2019-08-031-2/+0
|
* Rename to Diffing and move module into credentials commandKasper Timm Hansen2019-08-033-59/+54
| | | | | | | | | Helpers is more for sharing between commands. Since `Diffing` is only for credentials we should just keep it only for credentials. Replaces "pretty" with diffing since the former is ambiguous, while diffing captures what it does. `opt_in` seemed clunky so it's swapped for the one-word enable.
* Merge pull request #36849 from yahonda/use_assert_nily-yagi2019-08-031-2/+2
|\ | | | | Address `DEPRECATED: Use assert_nil if expecting nil`
| * Address `DEPRECATED: Use assert_nil if expecting nil`Yasuo Honda2019-08-031-2/+2
|/ | | | | | | | | | | | | | | | | ```ruby $ cd activerecord $ bin/test test/cases/dirty_test.rb:494 ... snip ... DEPRECATED: Use assert_nil if expecting nil from /home/yahonda/git/rails/activerecord/test/cases/dirty_test.rb:494. This will fail in Minitest 6. DEPRECATED: Use assert_nil if expecting nil from /home/yahonda/git/rails/activerecord/test/cases/dirty_test.rb:511. This will fail in Minitest 6. . Finished in 0.061593s, 16.2356 runs/s, 795.5428 assertions/s. 1 runs, 49 assertions, 0 failures, 0 errors, 0 skips $ ``` Refer seattlerb/minitest#666 rails/rails#27712
* Merge pull request #36846 from SGourshete/masterVipul A M2019-08-031-1/+1
|\ | | | | typo in word compatibily -> compatibility [ci skip]
| * typo in word compatibily - autoloading and reloading constants guideSwapnil Gourshete2019-08-031-1/+1
|/
* 1.hour needs core_ext to workRafael Mendonça França2019-08-021-0/+2
| | | | | | Usually the application requires the entire active support at load time but the configuration happens before it is loaded. For that reason we need to require the core_ext that we want to use in this file.
* Merge pull request #36843 from ↵Eileen M. Uchitelle2019-08-023-7/+43
|\ | | | | | | | | eileencodes/add-ability-to-unset-preventing-writes Add ability to unset preventing writes
| * Add ability to unset preventing writeseileencodes2019-08-023-7/+43
|/ | | | | | | | | | | Previously if an app attempts to do a write inside a read request it will be impossilbe to switch back to writing to the primary. This PR adds an argument to the `while_preventing_writes` so that we can make sure to turn it off if we're doing a write on a primary. Fixes #36830 Co-authored-by: John Crepezzi <john.crepezzi@gmail.com>
* Merge pull request #36814 from eileencodes/introduce-invalid-configuration-errorEileen M. Uchitelle2019-08-022-3/+23
|\ | | | | Introduce InvalidConfigurationError
| * Introduce InvalidConfigurationErroreileencodes2019-08-012-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In our app at work we had a faked config like this: ``` { "foo" => :bar, "bar" => { "adapter" => "memory" } } ``` This config is invalid. You can't say for foo env just have a symbol, nor would this work if you had fa foo env with just a string. A configuration must be a url or an adapter or a database. Otherwise it's invalid and we can't parse it. When this was just yaml turned into hashes you could get away with passing whatever. It wouldn't work but it wouldn't blow up either. Now that we're using objects we were returning `nil` for these but that just means we either blow up on `for_current_env` or compact the `nil`'s. I think it's a better user experience to not build the configs and raise an appropriate error. This is also an invalid config because if you do pass a string here it should be a URL. ``` { "foo" => "bar", "bar" => { "adapter" => "memory" } } ```
* | This test needs integer core ext for timeRafael Mendonça França2019-08-021-0/+1
| |
* | ConditionalGet needs time core_extRafael Mendonça França2019-08-021-0/+1
| |
* | Require time extensions in the job that depends on timeRafael Mendonça França2019-08-021-0/+1
| |
* | Require integer conversion for this testRafael Mendonça França2019-08-021-0/+1
| |
* | Revert "No such class since 8d2866bb80fbe81acb04f5b0c44f152f571fb29f"Rafael Mendonça França2019-08-0250-57/+57
| | | | | | | | This reverts commit dd779c9686f49f5ed6dda8ad5a1cb3b0788e1dd4.
* | Revert "MethodCallAssertions is a regular player of the team ↵Rafael Mendonça França2019-08-0211-3/+28
| | | | | | | | | | | | ActiveSupport::TestCase now" This reverts commit 98d0f7ebd34b858f12a12dcf37ae54fdbb5cab64.
* | Revert "You give jruby_skip & rubinius_skip a good name"Rafael Mendonça França2019-08-028-20/+78
| | | | | | | | This reverts commit 8d2866bb80fbe81acb04f5b0c44f152f571fb29f.
* | Missing require AS/core_ext/date/conversionsAkira Matsuda2019-08-022-0/+2
| |
* | hash_conversion itself does not at all depend on time extensionsAkira Matsuda2019-08-021-1/+0
| |
* | Add *_previously_was attribute methods when dirty tracking (#36836)David Heinemeier Hansson2019-08-013-1/+19
| |
* | Merge pull request #36837 from composerinteralia/no-colorRyuta Kamizono2019-08-021-5/+0
|\ \ | | | | | | Remove duplicate method definition
| * | Remove duplicate method definitionDaniel Colson2019-08-011-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no_color! is already defined in [`Rails::Command::Behavior`][behavior], which gets [included into `Rails:Generators`][include]. This duplication came about in 6813edc7d9 when we introduced the Thor command structure. We have [test coverage][] to ensure this method still behaves correctly on `Rails:Generators`. [behavior]: https://github.com/rails/rails/blob/f7e91c7224560fbd3e95c238a0e8bb362799bcb7/railties/lib/rails/command/behavior.rb#L12-L14 [include]: https://github.com/rails/rails/blob/f7e91c7224560fbd3e95c238a0e8bb362799bcb7/railties/lib/rails/generators.rb#L18 [test coverage]: https://github.com/rails/rails/blob/f7e91c7224560fbd3e95c238a0e8bb362799bcb7/railties/test/generators_test.rb#L163-L168
* | | Lazily evaluate FileUpdateCheckerSharedTests when being includedAkira Matsuda2019-08-021-195/+199
| | | | | | | | | | | | To avoid "uninitialized constant ActiveSupport::Testing (NameError)"
* | | No such class since 8d2866bb80fbe81acb04f5b0c44f152f571fb29fAkira Matsuda2019-08-0250-57/+57
|/ /
* | Merge pull request #36821 from rails/virtual-attribute-typeRyuta Kamizono2019-08-021-0/+84
|\ \ | | | | | | Add tests for selecting aggregrates
| * | Add tests for selecting aggregatesGodfrey Chan2019-08-011-0/+84
| | | | | | | | | | | | | | | | | | These tests verifies that aggregates like `AVG` can be selected as "virtual attributes" on Active Record models and have the correct column type.
* | | Missing require AS/core_ext/string/inflectionsAkira Matsuda2019-08-021-0/+2
| | |
* | | Let's try not to depend too much on other core extensions in a core ↵Akira Matsuda2019-08-021-1/+1
| | | | | | | | | | | | extension test
* | | Missing require AS/core_ext/object/blankAkira Matsuda2019-08-021-0/+1
| | |
* | | require only what each test concernsAkira Matsuda2019-08-024-4/+7
| | |
* | | You give jruby_skip & rubinius_skip a good nameAkira Matsuda2019-08-028-78/+20
| | | | | | | | | | | | | | | | | | | | | | | | This hack prevails everywhere in the codebase by being copy & pasted, and it's actually not a negative thing but a necessary thing for framework implementors, so it should better have a name and be a thing. And with this commit, activesupport/test/abstract_unit.rb now doesn't silently autoload AS::TestCase, so we're ready to establish clearner environment for running AS tests (probably in later commits)
* | | MethodCallAssertions is a regular player of the team ActiveSupport::TestCase nowAkira Matsuda2019-08-0211-28/+3
| |/ |/| | | | | It's used everywhere, clean and mature enough
* | Merge pull request #36834 from kamipo/deduplicate_joinsRyuta Kamizono2019-08-022-3/+13
|\ \ | |/ |/| Deduplicate joins values
| * Deduplicate joins valuesRyuta Kamizono2019-08-022-3/+13
|/ | | | | | | | | #36805 have one possible regression that failing deduplication if `joins_values` have complex order (e.g. `joins_values = [join_node_a, :comments, :tags, join_node_a]`). This fixes the deduplication to take it in the first phase before grouping.
* Fix `_write_layout_method`Ryuta Kamizono2019-08-021-1/+1
|
* No private defRafael Mendonça França2019-08-013-4/+8
|
* Merge pull request #36831 from ↵Carlos Antonio da Silva2019-08-011-1/+1
|\ | | | | | | | | akshaymohite/fix-form-helpers-documentation-comment Added missing comment notation for the example of form_with in form_helpers.md documentation. [ci skip]
| * Added missing comment notation for the example of form_with in ↵Akshay Mohite2019-08-011-1/+1
|/ | | | form_helpers.md documentation. [ci skip]
* Missing require "AS/core_ext/date_time/conversions"Akira Matsuda2019-08-011-0/+1
| | | | | This causes "NameError: undefined local variable or method `nsec' for #<DateTime:0x0000559163cdd878>"
* Another missing require "AS/core_ext/object/try"Akira Matsuda2019-08-011-0/+1
|
* It may be better to explicitly require 'object/try' where we call `try`Akira Matsuda2019-08-0114-0/+21
| | | | | | In most cases it works now without explicit require because it's accidentally required through active_support/core_ext/date_and_time/calculations.rb where we still call `try`, but that would stop working if we changed the Calculations implementation and remove the require call there.
* Don't require 'active_support/all' in an individual test case!!!Akira Matsuda2019-08-012-1/+1
| | | | and Git taught me that this crap was added via this commit... https://github.com/rails/rails/commit/68db6bc431fbff0b2291f1f60ccf974b4eece596
* These methods doesn't have to be `protected`Akira Matsuda2019-08-012-6/+3
|
* Use `try` only when we're unsure if the receiver would respond_to the methodAkira Matsuda2019-08-0124-43/+40
|
* Merge pull request #36827 from akshaymohite/fix-documentation-typo-in-exampleVipul A M2019-08-011-1/+1
|\ | | | | Fixed a typo in documentation example of activerecord database configuration. [ci skip]
| * Fixed a typo in documentation example of activerecord database ↵Akshay Mohite2019-08-011-1/+1
| | | | | | | | | | | | configuration. [ci skip] - The example has sqlite3 adpater in database.yml, whereas configuration object had incorrectly specified mysql2 in documentation.
* | Do not use the same test class in different testsyuuji.yaginuma2019-08-011-2/+2
| | | | | | | | | | | | | | | | | | This fixes the following warnings. ``` actionmailer/test/base_test.rb:272: warning: method redefined; discarding old welcome actionmailer/test/base_test.rb:260: warning: previous definition of welcome was here ```
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 01:30:49 +0000