From 1adab9d2f5d7863b6df32992ecb21dcea5b51d21 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Wed, 1 May 2019 09:13:13 +0200
Subject: 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.
---
 tests/fixtures/mod.rs | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'tests/fixtures/mod.rs')

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")
 }
-- 
cgit v1.2.3