diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-02-23 15:55:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-23 15:55:15 +0100 |
| commit | 039380e3eeb24ed17f1824183b94638f0cfff747 (patch) | |
| tree | 043922cdcb7298443aac11f594c412404a299fe9 /railties/test/generators | |
| parent | 11660945696155c86a05260795e1a0afce0d291d (diff) | |
| download | rails-039380e3eeb24ed17f1824183b94638f0cfff747.tar.gz rails-039380e3eeb24ed17f1824183b94638f0cfff747.tar.bz2 rails-039380e3eeb24ed17f1824183b94638f0cfff747.zip | |
Revert "Add encrypted secrets" (#28127)
Diffstat (limited to 'railties/test/generators')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/encrypted_secrets_generator_test.rb | 42 |
2 files changed, 0 insertions, 43 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 986afb6d2a..1ac2b4cde0 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -335,7 +335,6 @@ class AppGeneratorTest < Rails::Generators::TestCase end assert_file "config/environments/production.rb" do |content| assert_match(/# config\.action_mailer\.raise_delivery_errors = false/, content) - assert_match(/^ config\.read_encrypted_secrets = true/, content) end end diff --git a/railties/test/generators/encrypted_secrets_generator_test.rb b/railties/test/generators/encrypted_secrets_generator_test.rb deleted file mode 100644 index 747abf19ed..0000000000 --- a/railties/test/generators/encrypted_secrets_generator_test.rb +++ /dev/null @@ -1,42 +0,0 @@ -require "generators/generators_test_helper" -require "rails/generators/rails/encrypted_secrets/encrypted_secrets_generator" - -class EncryptedSecretsGeneratorTest < Rails::Generators::TestCase - include GeneratorsTestHelper - - def setup - super - cd destination_root - end - - def test_generates_key_file_and_encrypted_secrets_file - run_generator - - assert_file "config/secrets.yml.key", /[\w\d]+/ - - assert File.exist?("config/secrets.yml.enc") - assert_no_match(/production:\n# external_api_key: [\w\d]+/, IO.binread("config/secrets.yml.enc")) - assert_match(/production:\n# external_api_key: [\w\d]+/, Rails::Secrets.read) - end - - def test_appends_to_gitignore - FileUtils.touch(".gitignore") - - run_generator - - assert_file ".gitignore", /config\/secrets.yml.key/, /(?!config\/secrets.yml.enc)/ - end - - def test_warns_when_ignore_is_missing - assert_match(/Add this to your ignore file/i, run_generator) - end - - def test_doesnt_generate_a_new_key_file_if_already_opted_in_to_encrypted_secrets - FileUtils.mkdir("config") - File.open("config/secrets.yml.enc", "w") { |f| f.puts "already secrety" } - - run_generator - - assert_no_file "config/secrets.yml.key" - end -end |