Edits based on code review comments

Author: heisencoder

src/server.rs

@@ -85,8 +85,7 @@ fn get_router(options: &Options, output: WasmBindgenOutput) -> Router {
     let serve_dir =
         get_service(ServeDir::new(options.directory.clone())).handle_error(internal_server_error);
 
-    let serve_wasm = |headers: HeaderMap| async move {
-        println!(" request headers: {:?}", headers);
+    let serve_wasm = || async move {
         ([("content-encoding", "br")], WithContentType("application/wasm", compressed_wasm))
     };
 
@@ -172,50 +171,45 @@ mod pick_port {
 
 #[cfg(test)]
 mod tests {
+    use std::collections::HashMap;
+
     use crate::server::get_router;
-    use crate::wasm_bindgen;
+    use crate::wasm_bindgen::WasmBindgenOutput;
     use crate::Options;
-    use axum::body::Bytes;
     use axum::http::StatusCode;
     use axum_test_helper::TestClient;
-    use std::path::Path;
-
-    /// Headers for requests from 127.0.0.1 and local IP:
-    ///
-    /// In this request, br is missing from the "accept-encoding" header
-    ///
-    /// request headers: {"host": "192.168.68.107:1334", "connection": "keep-alive",
-    /// "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36",
-    /// "accept": "*/*", "referer": "http://192.168.68.107:1334/",
-    /// "accept-encoding": "gzip, deflate", "accept-language": "en-US,en;q=0.9"}
-
-    /// request headers: {"host": "127.0.0.1:1334", "connection": "keep-alive",
-    /// "sec-ch-ua": "\"Google Chrome\";v=\"107\", \"Chromium\";v=\"107\", \"Not=A?Brand\";v=\"24\"",
-    /// "sec-ch-ua-mobile": "?0",
-    /// "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36",
-    /// "sec-ch-ua-platform": "\"Linux\"", "accept": "*/*", "sec-fetch-site": "same-origin",
-    /// "sec-fetch-mode": "cors", "sec-fetch-dest": "empty", "referer": "http://127.0.0.1:1334/",
-    /// "accept-encoding": "gzip, deflate, br", "accept-language": "en-US,en;q=0.9"}
-
-    /// To run this test, it is necessary to first create `example-project.wasm` by these commands:
-    ///   cd example-project
-    ///   cargo build
-    #[tokio::test]
-    async fn test_router() {
-        let options = Options {
+
+    const FAKE_BR_COMPRESSED_WASM: [u8; 4] = [1, 2, 3, 4];
+
+    fn fake_options() -> Options {
+        Options {
             title: "title".to_string(),
             address: "127.0.0.1:0".to_string(),
             directory: ".".to_string(),
             https: false,
             no_module: false,
-        };
+        }
+    }
 
-        let wasm_file =
-            Path::new("example-project/target/wasm32-unknown-unknown/debug/example-project.wasm");
-        let output = wasm_bindgen::generate(&options, wasm_file).unwrap();
+    fn fake_wasm_bindgen_output() -> WasmBindgenOutput {
+        WasmBindgenOutput {
+            js: "fake js".to_string(),
+            compressed_wasm: FAKE_BR_COMPRESSED_WASM.to_vec(),
+            snippets: HashMap::<String, Vec<String>>::new(),
+            local_modules: HashMap::<String, String>::new(),
+        }
+    }
+
+    fn make_test_client() -> TestClient {
+        let options = fake_options();
+        let output = fake_wasm_bindgen_output();
         let router = get_router(&options, output);
-        println!("{:?}", &router);
-        let client = TestClient::new(router);
+        TestClient::new(router)
+    }
+
+    #[tokio::test]
+    async fn test_router() {
+        let client = make_test_client();
 
         // Test with br compression requested
         let mut res = client
@@ -225,19 +219,6 @@ mod tests {
             .await;
         assert_eq!(res.status(), StatusCode::OK);
         let result = res.chunk().await.unwrap();
-        assert_ne!(result[0..3], Bytes::from(vec![0x1f, 0x8b, 0x08]));
-
-        // Test without br compression
-        // let mut res = client
-        //     .get("/api/wasm.wasm")
-        //     .header("accept-encoding", "gzip, deflate")
-        //     .send()
-        //     .await;
-        // assert_eq!(res.status(), StatusCode::OK);
-        // let result = res.chunk().await.unwrap();
-        // // This is the gzip 3-byte file header
-        // assert_eq!(result[0..3], Bytes::from(vec![0x1f, 0x8b, 0x08]));
-
-        //tokio_test::block_on(server).unwrap();
+        assert_eq!(result.to_vec(), FAKE_BR_COMPRESSED_WASM);
     }
 }