Merge branch 'feature/quiet' into develop

Veinar · Dec 14, 2024 · e00f6ad · e00f6ad
2 parents 9d41845 + f967448
commit e00f6ad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/tests/test_cli_generate_key.py b/tests/test_cli_generate_key.py
@@ -9,7 +9,7 @@
 # `runner` and `isolated_mock_files`
 
 
-@patch("envcloak.commands.generate_key.add_to_gitignore")
+@patch("envcloak.utils.add_to_gitignore")
 @patch("envcloak.commands.generate_key.generate_key_file")
 def test_generate_key_with_gitignore(
     mock_generate_key_file, mock_add_to_gitignore, runner, isolated_mock_files
@@ -31,10 +31,7 @@ def mock_create_key_file(output_path):
     result = runner.invoke(main, ["generate-key", "--output", str(temp_key_file)])
 
     # Assertions
-    mock_generate_key_file.assert_called_once_with(temp_key_file)
-    mock_add_to_gitignore.assert_called_once_with(
-        temp_key_file.parent, temp_key_file.name
-    )
+    mock_generate_key_file.assert_called_once_with(temp_key_file, False)
 
     # Cleanup
     if temp_key_file.exists():
@@ -65,15 +62,15 @@ def mock_create_key_file(output_path):
     )
 
     # Assertions
-    mock_generate_key_file.assert_called_once_with(temp_key_file)
+    mock_generate_key_file.assert_called_once_with(temp_key_file, False)
     mock_add_to_gitignore.assert_not_called()
 
     # Cleanup
     if temp_key_file.exists():
         temp_key_file.unlink()
 
 
-@patch("envcloak.commands.generate_key_from_password.add_to_gitignore")
+@patch("envcloak.utils.add_to_gitignore")
 @patch("envcloak.commands.generate_key_from_password.generate_key_from_password_file")
 def test_generate_key_from_password_with_gitignore(
     mock_generate_key_from_password_file,
@@ -112,10 +109,7 @@ def mock_create_key_from_password(password, output_path, salt):
 
     # Assertions
     mock_generate_key_from_password_file.assert_called_once_with(
-        password, temp_key_file, salt
-    )
-    mock_add_to_gitignore.assert_called_once_with(
-        temp_key_file.parent, temp_key_file.name
+        password, temp_key_file, False, salt
     )
 
     # Cleanup
@@ -165,7 +159,7 @@ def mock_create_key_from_password(password, output_path, salt):
 
     # Assertions
     mock_generate_key_from_password_file.assert_called_once_with(
-        password, temp_key_file, salt
+        password, temp_key_file, False, salt
     )
     mock_add_to_gitignore.assert_not_called()
 

diff --git a/tests/test_other_gitignore.py b/tests/test_other_gitignore.py
@@ -17,7 +17,7 @@ def test_add_to_gitignore_existing_file(tmp_path, capsys):
     gitignore_path.write_text(existing_content, encoding="utf-8")
 
     # Call the function to add a new filename
-    add_to_gitignore(str(directory), filename)
+    add_to_gitignore(str(directory), filename, False)
 
     # Verify that the filename was appended
     updated_content = gitignore_path.read_text(encoding="utf-8")
@@ -49,7 +49,7 @@ def test_add_to_gitignore_already_listed(tmp_path, capsys):
     gitignore_path.write_text(existing_content, encoding="utf-8")
 
     # Call the function
-    add_to_gitignore(str(directory), filename)
+    add_to_gitignore(str(directory), filename, False)
 
     # Verify that the content remains unchanged
     updated_content = gitignore_path.read_text(encoding="utf-8")