Modify integration tests to fail on panic

askagirl · Apr 7, 2019 · 3d11d76 · 3d11d76
1 parent fbd0ccb
commit 3d11d76
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 7 deletions.
diff --git a/tests/fixture/failure/compFailure.rs b/tests/fixture/failure/compFailure.rs
@@ -0,0 +1,3 @@
+fn main() {
+    let
+}
diff --git a/tests/fixture/compNoExercise.rs → tests/fixture/failure/compNoExercise.rs b/tests/fixture/compNoExercise.rs → tests/fixture/failure/compNoExercise.rs
diff --git a/tests/fixture/failure/info.toml b/tests/fixture/failure/info.toml
@@ -0,0 +1,7 @@
+[[exercises]]
+path = "compFailure.rs"
+mode = "compile"
+
+[[exercises]]
+path = "testFailure.rs"
+mode = "test"
diff --git a/tests/fixture/failure/testFailure.rs b/tests/fixture/failure/testFailure.rs
@@ -0,0 +1,4 @@
+#[test]
+fn passing() {
+    asset!(true);
+}
diff --git a/tests/fixture/compSuccess.rs → tests/fixture/success/compSuccess.rs b/tests/fixture/compSuccess.rs → tests/fixture/success/compSuccess.rs
diff --git a/tests/fixture/info.toml → tests/fixture/success/info.toml b/tests/fixture/info.toml → tests/fixture/success/info.toml
diff --git a/tests/fixture/testSuccess.rs → tests/fixture/success/testSuccess.rs b/tests/fixture/testSuccess.rs → tests/fixture/success/testSuccess.rs
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
@@ -13,55 +13,85 @@ fn fails_when_in_wrong_dir() {
         .unwrap()
         .current_dir("tests/")
         .assert()
-        .failure();
+        .code(1);
 }
 
 #[test]
 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]
 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);
 }