Fix edits from path test.

gibbz00 · Jan 23, 2024 · dc17dfc · dc17dfc
1 parent b2f8f35
commit dc17dfc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/crates/cli/src/run.rs b/crates/cli/src/run.rs
@@ -77,10 +77,6 @@ impl Cli {
 
     fn edit(input_args: InputArgs) -> anyhow::Result<()> {
         let explicit_file_path = input_args.file.as_deref();
-        if explicit_file_path.is_some_and(|file_arg| !file_arg.exists()) {
-            // TODO: return error suggesting to run `rops encrypt --in-place FILE`
-            todo!()
-        }
 
         return match Self::get_format(explicit_file_path, input_args.format)? {
             Format::Yaml => edit_encrypted_file::<YamlFileFormat>(explicit_file_path),
@@ -151,6 +147,7 @@ impl Cli {
                 }
             }
 
+            /// Returns Ok(None) if operation was cancelled.
             fn edit_temp_file<F: FileFormat>(temp_file_path: &Path) -> anyhow::Result<Option<RopsFileFormatMap<DecryptedMap, F>>> {
                 let (editor_command, args) = select_editor()?;
                 let mut command = Command::new(editor_command);
@@ -203,6 +200,7 @@ impl Cli {
                     bail!(RopsCliError::MultipleInputs)
                 }
                 drop(stdin_guard);
+
                 std::fs::read_to_string(plaintext_path)?
             }
             None => {

diff --git a/crates/cli/tests/mod.rs b/crates/cli/tests/mod.rs
@@ -91,9 +91,10 @@ fn edits_from_file() {
 
     let mut cmd = Command::package_command().edit_age();
     cmd.arg(temp_file.path());
+    cmd.run_tty();
 
     let encrypted_content = std::fs::read_to_string(temp_file.path()).unwrap();
-    pretty_assertions::assert_eq!(EDIT_CONTENT, decrypt_str::<AgeIntegration>(&encrypted_content).to_string())
+    pretty_assertions::assert_eq!(EDIT_CONTENT, decrypt_str::<AgeIntegration>(&encrypted_content).map().to_string())
 }
 
 fn assert_encrypted<I: IntegrationTestUtils>(encrypted_output: Output, expected_plaintext: &str) {
@@ -159,9 +160,8 @@ impl EditCommand for Command {
     fn edit_age(mut self) -> Self {
         std::env::set_var(
             "EDITOR",
-            format!("{} \"{}\"", path_to_mock_editor().to_str().expect("valid unicode"), EDIT_CONTENT),
+            format!("{} '{}'", path_to_mock_editor().to_str().expect("valid unicode"), EDIT_CONTENT),
         );
-
         AgeIntegration::set_mock_private_key_env_var();
 
         self.arg("edit");