Remove mock client (#17)

Author: abbiemery

Cargo.toml

@@ -14,3 +14,6 @@ async-graphql-axum = "7.0.17"
 url = "2.5.7"
 config = "0.15.16"
 clap = { version = "4.5.48", features = ["derive"] }
+
+[dev-dependencies]
+httpmock = "0.8.2"

src/clients.rs

@@ -1,8 +1,4 @@
 use std::fmt;
-#[cfg(test)]
-use std::fs::File;
-#[cfg(test)]
-use std::path::PathBuf;
 
 use reqwest::Url;
 use serde::de::DeserializeOwned;
@@ -37,29 +33,6 @@ impl Client for TiledClient {
     }
 }
 
-#[cfg(test)]
-pub struct MockTiledClient {
-    pub dir_path: PathBuf,
-}
-
-#[cfg(test)]
-impl MockTiledClient {
-    async fn deserialize_from_file<T: DeserializeOwned>(&self, filename: &str) -> ClientResult<T> {
-        println!("Requesting data from mock");
-
-        let path = self.dir_path.join(filename);
-        let file = File::open(&path)?;
-
-        Ok(serde_json::from_reader(file)?)
-    }
-}
-#[cfg(test)]
-impl Client for MockTiledClient {
-    async fn metadata(&self) -> ClientResult<Metadata> {
-        self.deserialize_from_file("tiled_metadata.json").await
-    }
-}
-
 #[derive(Debug)]
 pub enum ClientError {
     Parse(url::ParseError),

src/handlers.rs

@@ -8,7 +8,7 @@ use crate::clients::Client;
 use crate::model::TiledQuery;
 
 pub async fn graphql_handler<T: Client + Send + Sync + 'static>(
-    schema: Extension<Schema<TiledQuery<T>, EmptyMutation, EmptySubscription>>,
+    schema: Extension<Schema<TiledQuery, EmptyMutation, EmptySubscription>>,
     req: GraphQLRequest,
 ) -> GraphQLResponse {
     let query = req.into_inner().query;
@@ -23,15 +23,27 @@ pub async fn graphiql_handler() -> impl IntoResponse {
 #[cfg(test)]
 mod tests {
     use async_graphql::{EmptyMutation, EmptySubscription, Schema};
+    use httpmock::MockServer;
+    use url::Url;
 
     use crate::TiledQuery;
-    use crate::clients::MockTiledClient;
+    use crate::clients::TiledClient;
 
     #[tokio::test]
     async fn test_api_version_query() {
+        let mock_server = MockServer::start();
+
+        let mock = mock_server
+            .mock_async(|when, then| {
+                when.method("GET").path("/api/v1/");
+                then.status(200)
+                    .body_from_file("resources/tiled_metadata.json");
+            })
+            .await;
+
         let schema = Schema::build(
-            TiledQuery(MockTiledClient {
-                dir_path: "./resources".into(),
+            TiledQuery(TiledClient {
+                address: Url::parse(&mock_server.base_url()).unwrap(),
             }),
             EmptyMutation,
             EmptySubscription,
@@ -40,8 +52,7 @@ mod tests {
 
         let response = schema.execute("{metadata { apiVersion } }").await;
 
-        println!("{:?}", response.data.to_string());
-
-        assert!(response.data.to_string() == "{metadata: {apiVersion: 0}}")
+        assert_eq!(response.data.to_string(), "{metadata: {apiVersion: 0}}");
+        mock.assert();
     }
 }

src/model.rs

@@ -2,12 +2,12 @@ pub(crate) mod metadata;
 
 use async_graphql::Object;
 
-use crate::clients::{Client, ClientError};
+use crate::clients::{Client, ClientError, TiledClient};
 
-pub(crate) struct TiledQuery<T>(pub T);
+pub(crate) struct TiledQuery(pub TiledClient);
 
 #[Object]
-impl<T: Client + Send + Sync + 'static> TiledQuery<T> {
+impl TiledQuery {
     async fn metadata(&self) -> async_graphql::Result<metadata::Metadata, ClientError> {
         self.0.metadata().await
     }