1 files changed, 15 insertions, 4 deletions
diff --git a/railties/test/commands/credentials_test.rb b/railties/test/commands/credentials_test.rb
index 3654e96aed..0ee36081c0 100644
--- a/railties/test/commands/credentials_test.rb
+++ b/railties/test/commands/credentials_test.rb
@@ -63,7 +63,7 @@ class Rails::Command::CredentialsCommandTest < ActiveSupport::TestCase
     end
   end
 
-  test "edit command properly expand environment option" do
+  test "edit command properly expands environment option" do
     assert_match(/access_key_id: 123/, run_edit_command(environment: "prod"))
     Dir.chdir(app_path) do
       assert File.exist?("config/credentials/production.key")
@@ -79,11 +79,20 @@ class Rails::Command::CredentialsCommandTest < ActiveSupport::TestCase
     assert_match(/access_key_id: 123/, run_edit_command(environment: "qa"))
   end
 
+  test "edit command generates template file when the file does not exist" do
+    FileUtils.rm("#{app_path}/config/credentials.yml.enc")
+    run_edit_command
+
+    output = run_show_command
+    assert_match(/access_key_id: 123/, output)
+    assert_match(/secret_key_base/, output)
+  end
+
   test "show credentials" do
     assert_match(/access_key_id: 123/, run_show_command)
   end
 
-  test "show command raise error when require_master_key is specified and key does not exist" do
+  test "show command raises error when require_master_key is specified and key does not exist" do
     remove_file "config/master.key"
     add_to_config "config.require_master_key = true"
 
@@ -103,10 +112,12 @@ class Rails::Command::CredentialsCommandTest < ActiveSupport::TestCase
     assert_match(/access_key_id: 123/, run_show_command(environment: "production"))
   end
 
-  test "show command properly expand environment option" do
+  test "show command properly expands environment option" do
     run_edit_command(environment: "production")
 
-    assert_match(/access_key_id: 123/, run_show_command(environment: "prod"))
+    output = run_show_command(environment: "prod")
+    assert_match(/access_key_id: 123/, output)
+    assert_no_match(/secret_key_base/, output)
   end
 
   private