Merge pull request #57 from conradkleinespel/fix-test

Fixes pipe test

.github/workflows/tests.yml

@@ -17,5 +17,6 @@ jobs:
         name: Run cargo test
         with:
           command: test
+          args: --all-targets --all-features
       - name: Run terminal tests
-        run: ./tests/tests-unix.sh
+        run: ./tests/tests-unix.sh

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "rpassword"
-version = "5.0.0"
+version = "5.0.1"
 authors = ["Conrad Kleinespel <conradk@conradk.com>"]
 description = "Read passwords in console applications."
 license = "Apache-2.0"

tests/piped.rs

@@ -1,27 +1,21 @@
 //! This test checks that piped input is handled correctly.
 
-use std::env;
 use std::io::Write;
 use std::process::{Command, Stdio};
 
 #[test]
 fn piped_password() {
-    // Find target directory
-    let target_dir = env::current_exe()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .to_path_buf();
-
     // Run an example that reads a password and prints it
-    let mut out = Command::new(target_dir.join("examples/read-password"))
+    let mut out = Command::new("cargo")
+        .arg("run")
+        .arg("--quiet")
+        .arg("--example")
+        .arg("read-password")
         .stdout(Stdio::piped())
         .stdin(Stdio::piped())
         .spawn()
         .unwrap();
-    
+
     // Write "secret" as the password into stdin
     let stdin = out.stdin.as_mut().unwrap();
     stdin.write_all("secret".as_bytes()).unwrap();

tests/tests-unix.sh

@@ -13,14 +13,14 @@ DIR="$( dirname $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) )"
 #   - diff tests/stderr <(printf "prompt_password_stderrprompt_reply_stderr")
 
 # STDIN comes from a pipe
-printf "1\n2\n3\n" | $DIR/target/debug/examples/tests > $DIR/tests/results_pipe_actual_stdout 2> $DIR/tests/results_pipe_actual_stderr
+printf "1\n2\n3\n" | cargo run --quiet --example tests > $DIR/tests/results_pipe_actual_stdout 2> $DIR/tests/results_pipe_actual_stderr
 diff $DIR/tests/results_pipe_expected_stdout $DIR/tests/results_pipe_actual_stdout
 echo 'pipe stdout OK'
 diff $DIR/tests/results_pipe_expected_stderr $DIR/tests/results_pipe_actual_stderr
 echo 'pipe stderr OK'
 
 # missing newline, only tested in pipe mode
-printf "1\n2\n3" | $DIR/target/debug/examples/tests > $DIR/tests/results_pipe_missing_nl_actual_stdout 2> $DIR/tests/results_pipe_missing_nl_actual_stderr
+printf "1\n2\n3" | cargo run --quiet --example tests > $DIR/tests/results_pipe_missing_nl_actual_stdout 2> $DIR/tests/results_pipe_missing_nl_actual_stderr
 diff $DIR/tests/results_pipe_missing_nl_expected_stdout $DIR/tests/results_pipe_missing_nl_actual_stdout
 echo 'pipe with missing nl stdout OK'
 diff $DIR/tests/results_pipe_missing_nl_expected_stderr $DIR/tests/results_pipe_missing_nl_actual_stderr