tests: Use json! macro to assert on error responses instead of bad_with_status()

Author: Turbo87

src/tests/krate/dependencies.rs

@@ -26,6 +26,10 @@ fn dependencies() {
         .good();
     assert_eq!(deps.dependencies[0].crate_id, "bar_deps");
 
-    anon.get::<()>("/api/v1/crates/foo_deps/1.0.2/dependencies")
-        .bad_with_status(StatusCode::OK);
+    let response = anon.get::<()>("/api/v1/crates/foo_deps/1.0.2/dependencies");
+    response.assert_status(StatusCode::OK);
+    assert_eq!(
+        response.json(),
+        json!({ "errors": [{ "detail": "crate `foo_deps` does not have a version `1.0.2`" }] })
+    );
 }

src/tests/krate/publish.rs

@@ -86,15 +86,15 @@ fn invalid_names() {
 
     let bad_name = |name: &str, error_message: &str| {
         let crate_to_publish = PublishBuilder::new(name).version("1.0.0");
-        let json = token
-            .enqueue_publish(crate_to_publish)
-            .bad_with_status(StatusCode::OK);
-
-        assert!(
-            json.errors[0].detail.contains(error_message,),
-            "{:?}",
-            json.errors
-        );
+        let response = token.enqueue_publish(crate_to_publish);
+        response.assert_status(StatusCode::OK);
+
+        let json = response.json();
+        let json = json.as_object().unwrap();
+        let errors = json.get("errors").unwrap().as_array().unwrap();
+        let first_error = errors.first().unwrap().as_object().unwrap();
+        let detail = first_error.get("detail").unwrap().as_str().unwrap();
+        assert!(detail.contains(error_message), "{:?}", detail);
     };
 
     let error_message = "expected a valid crate name";
@@ -251,9 +251,13 @@ fn reject_new_krate_with_non_exact_dependency() {
     let crate_to_publish = PublishBuilder::new("new_dep")
         .version("1.0.0")
         .dependency(dependency);
-    token
-        .enqueue_publish(crate_to_publish)
-        .bad_with_status(StatusCode::OK);
+
+    let response = token.enqueue_publish(crate_to_publish);
+    response.assert_status(StatusCode::OK);
+    assert_eq!(
+        response.json(),
+        json!({ "errors": [{ "detail": "no known crate named `foo_dep`" }] })
+    );
 }
 
 #[test]
@@ -696,19 +700,28 @@ fn bad_keywords() {
     let (_, _, _, token) = TestApp::init().with_token();
     let crate_to_publish =
         PublishBuilder::new("foo_bad_key").keyword("super-long-keyword-name-oh-no");
-    token
-        .enqueue_publish(crate_to_publish)
-        .bad_with_status(StatusCode::OK);
+    let response = token.enqueue_publish(crate_to_publish);
+    response.assert_status(StatusCode::OK);
+    assert_eq!(
+        response.json(),
+        json!({ "errors": [{ "detail": "invalid upload request: invalid length 29, expected a keyword with less than 20 characters at line 1 column 221" }] })
+    );
 
     let crate_to_publish = PublishBuilder::new("foo_bad_key").keyword("?@?%");
-    token
-        .enqueue_publish(crate_to_publish)
-        .bad_with_status(StatusCode::OK);
+    let response = token.enqueue_publish(crate_to_publish);
+    response.assert_status(StatusCode::OK);
+    assert_eq!(
+        response.json(),
+        json!({ "errors": [{ "detail": "invalid upload request: invalid value: string \"?@?%\", expected a valid keyword specifier at line 1 column 196" }] })
+    );
 
     let crate_to_publish = PublishBuilder::new("foo_bad_key").keyword("áccênts");
-    token
-        .enqueue_publish(crate_to_publish)
-        .bad_with_status(StatusCode::OK);
+    let response = token.enqueue_publish(crate_to_publish);
+    response.assert_status(StatusCode::OK);
+    assert_eq!(
+        response.json(),
+        json!({ "errors": [{ "detail": "invalid upload request: invalid value: string \"áccênts\", expected a valid keyword specifier at line 1 column 201" }] })
+    );
 }
 
 #[test]

src/tests/user.rs

@@ -297,8 +297,12 @@ fn following() {
     assert_eq!(r.versions.len(), 0);
     assert_eq!(r.meta.more, false);
 
-    user.get_with_query::<()>("/api/v1/me/updates", "page=0")
-        .bad_with_status(StatusCode::BAD_REQUEST);
+    let response = user.get_with_query::<()>("/api/v1/me/updates", "page=0");
+    response.assert_status(StatusCode::BAD_REQUEST);
+    assert_eq!(
+        response.json(),
+        json!({ "errors": [{ "detail": "page indexing starts from 1, page 0 is invalid" }] })
+    );
 }
 
 #[test]
@@ -526,11 +530,15 @@ fn test_other_users_cannot_change_my_email() {
         json!({ "errors": [{ "detail": "current user does not match requested user" }] })
     );
 
-    anon.update_email_more_control(
+    let response = anon.update_email_more_control(
         another_user_model.id,
         Some("[email protected]"),
-    )
-    .bad_with_status(StatusCode::FORBIDDEN);
+    );
+    response.assert_status(StatusCode::FORBIDDEN);
+    assert_eq!(
+        response.json(),
+        json!({ "errors": [{ "detail": "must be logged in to perform that action" }] })
+    );
 }
 
 /* Given a new user, test that their email can be added