From 5a233398ebe7078767404bd05ca06e08b37fb3d4 Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Fri, 5 Apr 2024 00:44:43 +0200
Subject: [PATCH] Fix tests

---
 src/run.rs                 | 10 +++++-----
 tests/dev_cargo_bins.rs    |  2 +-
 tests/integration_tests.rs | 13 +------------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/run.rs b/src/run.rs
index 0a09eccf..ee2d3b4f 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -1,4 +1,4 @@
-use anyhow::Result;
+use anyhow::{bail, Result};
 use std::io::{stdout, Write};
 
 use crate::exercise::Exercise;
@@ -17,11 +17,11 @@ pub fn run(exercise: &Exercise) -> Result<()> {
         stdout.flush()?;
     }
 
-    if output.status.success() {
-        success!("Successfully ran {}", exercise);
-    } else {
-        warn!("Ran {} with errors", exercise);
+    if !output.status.success() {
+        bail!("Ran {exercise} with errors");
     }
 
+    success!("Successfully ran {}", exercise);
+
     Ok(())
 }
diff --git a/tests/dev_cargo_bins.rs b/tests/dev_cargo_bins.rs
index ad4832f8..c3faea92 100644
--- a/tests/dev_cargo_bins.rs
+++ b/tests/dev_cargo_bins.rs
@@ -17,7 +17,7 @@ struct InfoToml {
 
 #[test]
 fn dev_cargo_bins() {
-    let content = fs::read_to_string("exercises/Cargo.toml").unwrap();
+    let content = fs::read_to_string("dev/Cargo.toml").unwrap();
 
     let exercises = toml_edit::de::from_str::<InfoToml>(&fs::read_to_string("info.toml").unwrap())
         .unwrap()
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index d1694a39..d853521f 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -194,24 +194,13 @@ fn run_test_exercise_does_not_prompt() {
 
 #[test]
 fn run_single_test_success_with_output() {
-    Command::cargo_bin("rustlings")
-        .unwrap()
-        .args(["--nocapture", "run", "testSuccess"])
-        .current_dir("tests/fixture/success/")
-        .assert()
-        .code(0)
-        .stdout(predicates::str::contains("THIS TEST TOO SHALL PASS"));
-}
-
-#[test]
-fn run_single_test_success_without_output() {
     Command::cargo_bin("rustlings")
         .unwrap()
         .args(["run", "testSuccess"])
         .current_dir("tests/fixture/success/")
         .assert()
         .code(0)
-        .stdout(predicates::str::contains("THIS TEST TOO SHALL PASS").not());
+        .stdout(predicates::str::contains("THIS TEST TOO SHALL PASS"));
 }
 
 #[test]