Make tests into their own proper modules without star imports

Star imports make it hard to see which imports a module is actually using so I prefer to have this be a bit more explicit.

5 files changed, 46 insertions, 21 deletions

diff --git a/tests/auth.rs b/tests/auth.rs
index 48f070e..f43553b 100644
--- a/tests/auth.rs
+++ b/tests/auth.rs
@@ -1,5 +1,14 @@
 mod fixtures;
-use fixtures::*;
+
+use assert_cmd::prelude::*;
+use assert_fs::fixture::TempDir;
+use fixtures::{port, tmpdir, Error, FILES};
+use rstest::rstest_parametrize;
+use select::document::Document;
+use select::predicate::Text;
+use std::process::{Command, Stdio};
+use std::thread::sleep;
+use std::time::Duration;
 
 #[rstest_parametrize(
     cli_auth_arg, client_username, client_password,
@@ -20,7 +29,7 @@ fn auth_works(
     port: u16,
     cli_auth_arg: &str,
     client_username: &str,
-    client_password: &str
+    client_password: &str,
 ) -> Result<(), Error> {
     let mut child = Command::cargo_bin("miniserve")?
         .arg(tmpdir.path())
diff --git a/tests/cli.rs b/tests/cli.rs
index fe0f141..d5df06b 100644
--- a/tests/cli.rs
+++ b/tests/cli.rs
@@ -1,5 +1,9 @@
 mod fixtures;
-use fixtures::*;
+
+use assert_cmd::prelude::*;
+use clap::{crate_name, crate_version};
+use fixtures::Error;
+use std::process::Command;
 
 #[test]
 /// Show help and exit.
diff --git a/tests/fixtures/mod.rs b/tests/fixtures/mod.rs
index d074cb0..9cfd2cf 100644
--- a/tests/fixtures/mod.rs
+++ b/tests/fixtures/mod.rs
@@ -1,27 +1,18 @@
-#![allow(dead_code)]
-
-pub use assert_cmd::prelude::*;
-pub use assert_fs::fixture::TempDir;
-pub use assert_fs::prelude::*;
-pub use clap::{crate_name, crate_version};
-pub use port_check::free_local_port;
-pub use reqwest;
-pub use reqwest::multipart;
-pub use rstest::rstest;
-pub use select::document::Document;
-pub use select::predicate::{Attr, Text};
-pub use std::process::{Command, Stdio};
-pub use std::thread::sleep;
-pub use std::time::Duration;
-pub use rstest::rstest_parametrize;
+use assert_fs::fixture::TempDir;
+use assert_fs::prelude::*;
+use port_check::free_local_port;
+use rstest::fixture;
 
 /// Error type used by tests
 pub type Error = Box<std::error::Error>;
 
 /// File names for testing purpose
+#[allow(dead_code)]
 pub static FILES: &[&str] = &["test.txt", "test.html", "test.mkv"];
 
 /// Test fixture which creates a temporary directory with a few files inside.
+#[fixture]
+#[allow(dead_code)]
 pub fn tmpdir() -> TempDir {
     let tmpdir = assert_fs::TempDir::new().expect("Couldn't create a temp dir for tests");
     for &file in FILES {
@@ -34,6 +25,8 @@ pub fn tmpdir() -> TempDir {
 }
 
 /// Get a free port.
+#[fixture]
+#[allow(dead_code)]
 pub fn port() -> u16 {
     free_local_port().expect("Couldn't find a free local port")
 }
diff --git a/tests/serve_request.rs b/tests/serve_request.rs
index 31b9b75..ef346b2 100644
--- a/tests/serve_request.rs
+++ b/tests/serve_request.rs
@@ -1,5 +1,14 @@
 mod fixtures;
-use fixtures::*;
+
+use assert_cmd::prelude::*;
+use assert_fs::fixture::TempDir;
+use fixtures::{port, tmpdir, Error, FILES};
+use rstest::rstest;
+use select::document::Document;
+use select::predicate::Text;
+use std::process::{Command, Stdio};
+use std::thread::sleep;
+use std::time::Duration;
 
 #[rstest]
 fn serves_requests_with_no_options(tmpdir: TempDir) -> Result<(), Error> {
diff --git a/tests/upload_files.rs b/tests/upload_files.rs
index 1bdecc3..6a24aee 100644
--- a/tests/upload_files.rs
+++ b/tests/upload_files.rs
@@ -1,5 +1,15 @@
 mod fixtures;
-use fixtures::*;
+
+use assert_cmd::prelude::*;
+use assert_fs::fixture::TempDir;
+use fixtures::{port, tmpdir, Error};
+use reqwest::multipart;
+use rstest::rstest;
+use select::document::Document;
+use select::predicate::{Attr, Text};
+use std::process::{Command, Stdio};
+use std::thread::sleep;
+use std::time::Duration;
 
 #[rstest]
 fn uploading_files_works(tmpdir: TempDir, port: u16) -> Result<(), Error> {