diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-05-25 17:11:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-25 17:11:20 +0200 |
| commit | 48f01f04d486667f1adf84a768e127308326e551 (patch) | |
| tree | 790e2376500bab40e8d73506eb61c6c13f68afd5 /railties/test/commands/secrets_test.rb | |
| parent | ee14c1b85028e103404f08da364d451863bb18e3 (diff) | |
| parent | 0338c81dc2ab6ef35fe68461e39c0bad0af5bb95 (diff) | |
| download | rails-48f01f04d486667f1adf84a768e127308326e551.tar.gz rails-48f01f04d486667f1adf84a768e127308326e551.tar.bz2 rails-48f01f04d486667f1adf84a768e127308326e551.zip | |
Merge pull request #29195 from kaspth/rails-secrets-better-edit-exception
Make `secrets:edit` run `secrets:setup` if it hasn't already.
Diffstat (limited to 'railties/test/commands/secrets_test.rb')
| -rw-r--r-- | railties/test/commands/secrets_test.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/railties/test/commands/secrets_test.rb b/railties/test/commands/secrets_test.rb index 00b0343397..fb8fd2325e 100644 --- a/railties/test/commands/secrets_test.rb +++ b/railties/test/commands/secrets_test.rb @@ -18,7 +18,8 @@ class Rails::Command::SecretsCommandTest < ActiveSupport::TestCase end test "edit secrets" do - run_setup_command + # Runs setup before first edit. + assert_match(/Adding config\/secrets\.yml\.key to store the encryption key/, run_edit_command) # Run twice to ensure encrypted secrets can be reread after first edit pass. 2.times do @@ -30,8 +31,4 @@ class Rails::Command::SecretsCommandTest < ActiveSupport::TestCase def run_edit_command(editor: "cat") Dir.chdir(app_path) { `EDITOR="#{editor}" bin/rails secrets:edit` } end - - def run_setup_command - Dir.chdir(app_path) { `bin/rails secrets:setup` } - end end |