Switching to json! macro

fxbox · Mar 1, 2016 · b83d7bb · b83d7bb
1 parent f982f0d
commit b83d7bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/controller.rs b/src/controller.rs
@@ -93,8 +93,7 @@ impl Controller for FoxBox {
         let services = self.services.lock().unwrap();
         match services.get(&id) {
             None => {
-                let mut response = Response::with(format!(
-                    "{{\"result\": \"error\", \"details\": \"No Such Service: {}\"}}", id));
+                let mut response = Response::with(json!({ error: "NoSuchService", id: id }));
                 response.status = Some(Status::BadRequest);
                 response.headers.set(AccessControlAllowOrigin::Any);
                 response.headers.set(ContentType::json());

diff --git a/src/service_router.rs b/src/service_router.rs
@@ -149,8 +149,7 @@ describe! service_router {
                         &service_router).unwrap();
 
         let result = response::extract_body_to_string(response);
-        assert_eq!(result,
-            "{\"result\": \"error\", \"details\": \"No Such Service: unknown-id\"}");
+        assert_eq!(result, "{\"error\":\"NoSuchService\",\"id\":\"unknown-id\"}");
     }
 
     it "should get the appropriate CORS headers" {