Merge pull request #36 from alexliesenfeld/develop

Formatting

src/api/adapter/local.rs

@@ -12,8 +12,7 @@ use crate::data::{
     ActiveMock, ClosestMatch, MockDefinition, MockIdentification, RequestRequirements,
 };
 use crate::server::web::handlers::{
-    add_new_mock, delete_all_mocks, delete_history, delete_one_mock,
-    verify, read_one_mock,
+    add_new_mock, delete_all_mocks, delete_history, delete_one_mock, read_one_mock, verify,
 };
 use crate::server::MockServerState;
 
@@ -74,10 +73,7 @@ impl MockServerAdapter for LocalMockServerAdapter {
         Ok(())
     }
 
-    async fn verify(
-        &self,
-        mock_rr: &RequestRequirements,
-    ) -> Result<Option<ClosestMatch>, String> {
+    async fn verify(&self, mock_rr: &RequestRequirements) -> Result<Option<ClosestMatch>, String> {
         verify(&self.local_state, mock_rr)
     }
 

src/api/adapter/mod.rs

@@ -12,8 +12,7 @@ use crate::data::{
     ActiveMock, ClosestMatch, MockDefinition, MockIdentification, RequestRequirements,
 };
 use crate::server::web::handlers::{
-    add_new_mock, delete_all_mocks, delete_history, delete_one_mock,
-    verify, read_one_mock,
+    add_new_mock, delete_all_mocks, delete_history, delete_one_mock, read_one_mock, verify,
 };
 use crate::server::{Mismatch, MockServerState};
 
@@ -79,10 +78,7 @@ pub trait MockServerAdapter {
     async fn fetch_mock(&self, mock_id: usize) -> Result<ActiveMock, String>;
     async fn delete_mock(&self, mock_id: usize) -> Result<(), String>;
     async fn delete_all_mocks(&self) -> Result<(), String>;
-    async fn verify(
-        &self,
-        rr: &RequestRequirements,
-    ) -> Result<Option<ClosestMatch>, String>;
+    async fn verify(&self, rr: &RequestRequirements) -> Result<Option<ClosestMatch>, String>;
     async fn delete_history(&self) -> Result<(), String>;
     async fn ping(&self) -> Result<(), String>;
 }

src/api/adapter/standalone.rs

@@ -172,10 +172,7 @@ impl MockServerAdapter for RemoteMockServerAdapter {
         Ok(())
     }
 
-    async fn verify(
-        &self,
-        mock_rr: &RequestRequirements,
-    ) -> Result<Option<ClosestMatch>, String> {
+    async fn verify(&self, mock_rr: &RequestRequirements) -> Result<Option<ClosestMatch>, String> {
         // Serialize to JSON
         let json = match serde_json::to_string(mock_rr) {
             Err(err) => return Err(format!("Cannot serialize mock object to JSON: {}", err)),

src/api/mock.rs

@@ -208,11 +208,9 @@ impl<'a> MockRef<'a> {
 
         if active_mock.call_counter > hits {
             assert_eq!(
-                active_mock.call_counter,
-                hits,
+                active_mock.call_counter, hits,
                 "The number of matching requests was higher than expected (expected {} but was {})",
-                hits,
-                active_mock.call_counter
+                hits, active_mock.call_counter
             )
         }
 

src/server/mod.rs

@@ -568,10 +568,7 @@ mod test {
         assert_eq!(PING_PATH.is_match("test/ping/1295473892374"), false);
 
         assert_eq!(VERIFY_PATH.is_match("/__verify"), true);
-        assert_eq!(
-            VERIFY_PATH.is_match("/__verify/1295473892374"),
-            false
-        );
+        assert_eq!(VERIFY_PATH.is_match("/__verify/1295473892374"), false);
         assert_eq!(VERIFY_PATH.is_match("test/verify/1295473892374"), false);
 
         assert_eq!(HISTORY_PATH.is_match("/__history"), true);

src/server/web/handlers.rs

@@ -251,8 +251,7 @@ mod test {
         HttpMockRequest, MockDefinition, MockServerHttpResponse, Pattern, RequestRequirements,
     };
     use crate::server::web::handlers::{
-        add_new_mock, verify, read_one_mock, request_matches,
-        validate_mock_definition,
+        add_new_mock, read_one_mock, request_matches, validate_mock_definition, verify,
     };
     use crate::server::MockServerState;
     use crate::Method;

src/server/web/routes.rs

@@ -69,10 +69,7 @@ pub(crate) fn read_one(state: &MockServerState, id: usize) -> Result<ServerRespo
 }
 
 /// This route is responsible for verification
-pub(crate) fn verify(
-    state: &MockServerState,
-    body: String,
-) -> Result<ServerResponse, String> {
+pub(crate) fn verify(state: &MockServerState, body: String) -> Result<ServerResponse, String> {
     let mock_rr: serde_json::Result<RequestRequirements> = serde_json::from_str(&body);
     if let Err(e) = mock_rr {
         return create_json_response(500, None, ErrorResponse::new(&e));