9 files changed, 53 insertions, 12 deletions

diff --git a/src/main.rs b/src/main.rs
index eca1a03..d4bb64c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -57,14 +57,11 @@ fn main() {
     }
 
     if let Some(matches) = matches.subcommand_matches("run") {
-        run(matches.clone()).unwrap();
+        run(matches.clone()).unwrap_or_else(|_| std::process::exit(1));
     }
 
     if matches.subcommand_matches("verify").is_some() {
-        match verify(None) {
-            Ok(_) => {}
-            Err(_) => std::process::exit(1),
-        }
+        verify(None).unwrap_or_else(|_| std::process::exit(1));
     }
 
     if matches.subcommand_matches("watch").is_some() {
diff --git a/tests/fixture/failure/compFailure.rs b/tests/fixture/failure/compFailure.rs
new file mode 100644
index 0000000..566856a
--- /dev/null
+++ b/tests/fixture/failure/compFailure.rs
@@ -0,0 +1,3 @@
+fn main() {
+    let
+}
\ No newline at end of file
diff --git a/tests/fixture/compNoExercise.rs b/tests/fixture/failure/compNoExercise.rs
index f79c691..f79c691 100644
--- a/tests/fixture/compNoExercise.rs
+++ b/tests/fixture/failure/compNoExercise.rs
diff --git a/tests/fixture/failure/info.toml b/tests/fixture/failure/info.toml
new file mode 100644
index 0000000..f4e7c0c
--- /dev/null
+++ b/tests/fixture/failure/info.toml
@@ -0,0 +1,7 @@
+[[exercises]]
+path = "compFailure.rs"
+mode = "compile"
+
+[[exercises]]
+path = "testFailure.rs"
+mode = "test"
\ No newline at end of file
diff --git a/tests/fixture/failure/testFailure.rs b/tests/fixture/failure/testFailure.rs
new file mode 100644
index 0000000..b33a5d2
--- /dev/null
+++ b/tests/fixture/failure/testFailure.rs
@@ -0,0 +1,4 @@
+#[test]
+fn passing() {
+    asset!(true);
+}
diff --git a/tests/fixture/compSuccess.rs b/tests/fixture/success/compSuccess.rs
index f79c691..f79c691 100644
--- a/tests/fixture/compSuccess.rs
+++ b/tests/fixture/success/compSuccess.rs
diff --git a/tests/fixture/info.toml b/tests/fixture/success/info.toml
index e255db9..e255db9 100644
--- a/tests/fixture/info.toml
+++ b/tests/fixture/success/info.toml
diff --git a/tests/fixture/testSuccess.rs b/tests/fixture/success/testSuccess.rs
index 589057c..589057c 100644
--- a/tests/fixture/testSuccess.rs
+++ b/tests/fixture/success/testSuccess.rs
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index 01c4744..a077918 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -13,7 +13,7 @@ fn fails_when_in_wrong_dir() {
         .unwrap()
         .current_dir("tests/")
         .assert()
-        .failure();
+        .code(1);
 }
 
 #[test]
@@ -21,39 +21,69 @@ fn verify_all_success() {
     Command::cargo_bin("rustlings")
         .unwrap()
         .arg("v")
-        .current_dir("tests/fixture/")
+        .current_dir("tests/fixture/success")
         .assert()
         .success();
 }
 
 #[test]
+fn verify_all_failure() {
+    Command::cargo_bin("rustlings")
+        .unwrap()
+        .arg("v")
+        .current_dir("tests/fixture/failure")
+        .assert()
+        .code(1);
+}
+
+#[test]
 fn run_single_compile_success() {
     Command::cargo_bin("rustlings")
         .unwrap()
         .args(&["r", "compSuccess.rs"])
-        .current_dir("tests/fixture/")
+        .current_dir("tests/fixture/success/")
         .assert()
         .success();
 }
 
 #[test]
+fn run_single_compile_failure() {
+    Command::cargo_bin("rustlings")
+        .unwrap()
+        .args(&["r", "compFailure.rs"])
+        .current_dir("tests/fixture/failure/")
+        .assert()
+        .code(1);
+}
+
+#[test]
 fn run_single_test_success() {
     Command::cargo_bin("rustlings")
         .unwrap()
         .args(&["r", "testSuccess.rs"])
-        .current_dir("tests/fixture/")
+        .current_dir("tests/fixture/success/")
         .assert()
         .success();
 }
 
 #[test]
+fn run_single_test_failure() {
+    Command::cargo_bin("rustlings")
+        .unwrap()
+        .args(&["r", "testFailure.rs"])
+        .current_dir("tests/fixture/failure/")
+        .assert()
+        .code(1);
+}
+
+#[test]
 fn run_single_test_no_filename() {
     Command::cargo_bin("rustlings")
         .unwrap()
         .arg("r")
         .current_dir("tests/fixture/")
         .assert()
-        .failure();
+        .code(1);
 }
 
 #[test]
@@ -61,7 +91,7 @@ fn run_single_test_no_exercise() {
     Command::cargo_bin("rustlings")
         .unwrap()
         .args(&["r", "compNoExercise.rs"])
-        .current_dir("tests/fixture/")
+        .current_dir("tests/fixture/failure")
         .assert()
-        .failure();
+        .code(1);
 }