From ff3bab81e9dc515e687c9bfea5dea0a719297131 Mon Sep 17 00:00:00 2001
From: zhoupeiheng <zhoupeiheng@bytedance.com>
Date: Thu, 28 Jul 2022 16:36:20 +0800
Subject: Apply suggestions from code review

---
 tests/config.rs        | 28 ----------------------------
 tests/serve_request.rs | 25 +++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 30 deletions(-)
 delete mode 100644 tests/config.rs

(limited to 'tests')

diff --git a/tests/config.rs b/tests/config.rs
deleted file mode 100644
index 136b3b1..0000000
--- a/tests/config.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-mod fixtures;
-
-use fixtures::{server_no_stderr, Error, TestServer};
-use regex::Regex;
-use rstest::rstest;
-use select::{document::Document, predicate::Attr};
-
-#[rstest]
-#[case(server_no_stderr(&[] as &[&str]), "/[a-f0-9]+")]
-#[case(server_no_stderr(&["--random-route"]), "/[a-f0-9]+")]
-#[case(server_no_stderr(&["--route-prefix", "foo"]), "/foo/[a-f0-9]+")]
-fn check_static_file_route_pattern(
-    #[case] server: TestServer,
-    #[case] route_pattern: String,
-) -> Result<(), Error> {
-    let body = reqwest::blocking::get(server.url())?;
-    let parsed = Document::from_read(body)?;
-    let re = Regex::new(&route_pattern).unwrap();
-
-    assert!(parsed
-        .find(Attr("rel", "stylesheet"))
-        .all(|x| re.is_match(x.attr("href").unwrap())));
-    assert!(parsed
-        .find(Attr("rel", "icon"))
-        .all(|x| re.is_match(x.attr("href").unwrap())));
-
-    Ok(())
-}
diff --git a/tests/serve_request.rs b/tests/serve_request.rs
index 450a8f5..3f5eeff 100644
--- a/tests/serve_request.rs
+++ b/tests/serve_request.rs
@@ -9,8 +9,7 @@ use fixtures::{
 use http::StatusCode;
 use regex::Regex;
 use rstest::rstest;
-use select::document::Document;
-use select::node::Node;
+use select::{document::Document, node::Node, predicate::Attr};
 use std::process::{Command, Stdio};
 use std::thread::sleep;
 use std::time::Duration;
@@ -281,3 +280,25 @@ fn serves_requests_with_route_prefix(#[case] server: TestServer) -> Result<(), E
 
     Ok(())
 }
+
+#[rstest]
+#[case(server_no_stderr(&[] as &[&str]), "/[a-f0-9]+")]
+#[case(server_no_stderr(&["--random-route"]), "/[a-f0-9]+")]
+#[case(server_no_stderr(&["--route-prefix", "foobar"]), "/foobar/[a-f0-9]+")]
+fn serves_requests_static_file_check(
+    #[case] server: TestServer,
+    #[case] static_file_pattern: String,
+) -> Result<(), Error> {
+    let body = reqwest::blocking::get(server.url())?;
+    let parsed = Document::from_read(body)?;
+    let re = Regex::new(&static_file_pattern).unwrap();
+
+    assert!(parsed
+        .find(Attr("rel", "stylesheet"))
+        .all(|x| re.is_match(x.attr("href").unwrap())));
+    assert!(parsed
+        .find(Attr("rel", "icon"))
+        .all(|x| re.is_match(x.attr("href").unwrap())));
+
+    Ok(())
+}
-- 
cgit v1.2.3