1 files changed, 24 insertions, 28 deletions
diff --git a/railties/test/commands/credentials_test.rb b/railties/test/commands/credentials_test.rb
index 3dec6fbe10..ec8fa4365e 100644
--- a/railties/test/commands/credentials_test.rb
+++ b/railties/test/commands/credentials_test.rb
@@ -10,9 +10,8 @@ require "tempfile"
 class Rails::Command::CredentialsCommandTest < ActiveSupport::TestCase
   include ActiveSupport::Testing::Isolation, EnvHelpers
 
-  setup { build_app }
-
-  teardown { teardown_app }
+  setup :build_app
+  teardown :teardown_app
 
   test "edit without editor gives hint" do
     run_edit_command(editor: "").tap do |output|
@@ -125,7 +124,7 @@ class Rails::Command::CredentialsCommandTest < ActiveSupport::TestCase
     assert(File.exist?(git_attributes))
     assert_equal(expected, File.read(git_attributes))
     Dir.chdir(app_path) do
-      assert_equal("bin/rails credentials:show\n", `git config --get 'diff.rails_credentials.textconv'`)
+      assert_equal "bin/rails credentials:diff", `git config --get 'diff.rails_credentials.textconv'`.strip
     end
   ensure
     file.close!
@@ -148,47 +147,41 @@ class Rails::Command::CredentialsCommandTest < ActiveSupport::TestCase
     assert_match(/access_key_id: 123/, run_show_command)
   end
 
-  test "show command when argument is provided (from git diff left file)" do
+  test "diff from git diff left file" do
     run_edit_command(environment: "development")
 
-    assert_match(/access_key_id: 123/, run_show_command("config/credentials/development.yml.enc"))
+    assert_match(/access_key_id: 123/, run_diff_command("config/credentials/development.yml.enc"))
   end
 
-  test "show command when argument is provided (from git diff right file)" do
+  test "diff from git diff right file" do
     run_edit_command(environment: "development")
 
-    dir = Dir.mktmpdir
-    file_path = File.join(dir, "KnAM4a_development.yml.enc")
-    file_content = File.read(app_path("config", "credentials", "development.yml.enc"))
-    File.write(file_path, file_content)
+    content_path = app_path("config", "credentials", "KnAM4a_development.yml.enc")
+    File.write(content_path,
+      File.read(app_path("config", "credentials", "development.yml.enc")))
 
-    assert_match(/access_key_id: 123/, run_show_command(file_path))
-  ensure
-    FileUtils.rm_rf(dir)
+    assert_match(/access_key_id: 123/, run_diff_command(content_path))
   end
 
-  test "show command when argument is provided (git diff) and filename is the master credentials" do
-    assert_match(/access_key_id: 123/, run_show_command("config/credentials.yml.enc"))
+  test "diff for main credentials" do
+    assert_match(/access_key_id: 123/, run_diff_command("config/credentials.yml.enc"))
   end
 
-  test "show command when argument is provided (git diff) and master key is not available" do
+  test "diff when master key is not available" do
     remove_file "config/master.key"
 
     raw_content = File.read(app_path("config", "credentials.yml.enc"))
-    assert_match(raw_content, run_show_command("config/credentials.yml.enc"))
+    assert_match(raw_content, run_diff_command("config/credentials.yml.enc"))
   end
 
-  test "show command when argument is provided (git diff) return the raw encrypted content in an error occurs" do
+  test "diff returns raw encrypted content when errors occur" do
     run_edit_command(environment: "development")
 
-    dir = Dir.mktmpdir
-    file_path = File.join(dir, "20190807development.yml.enc")
-    file_content = File.read(app_path("config", "credentials", "development.yml.enc"))
-    File.write(file_path, file_content)
+    content_path = app_path("20190807development.yml.enc")
+    encrypted_content = File.read(app_path("config", "credentials", "development.yml.enc"))
+    File.write(content_path, encrypted_content + "ruin decryption")
 
-    assert_match(file_content, run_show_command(file_path))
-  ensure
-    FileUtils.rm_rf(dir)
+    assert_match(encrypted_content, run_diff_command(content_path))
   end
 
   test "show command raises error when require_master_key is specified and key does not exist" do
@@ -227,9 +220,12 @@ class Rails::Command::CredentialsCommandTest < ActiveSupport::TestCase
       end
     end
 
-    def run_show_command(path = nil, environment: nil, **options)
+    def run_show_command(environment: nil, **options)
       args = environment ? ["--environment", environment] : []
-      args.unshift(path)
       rails "credentials:show", args, **options
     end
+
+    def run_diff_command(path, **options)
+      rails "credentials:diff", path, **options
+    end
 end