From 014bc52dc0e693bca8183bcf19c813452a34cc1c Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Mon, 29 Apr 2019 18:37:04 +0700
Subject: Move helpers.rs to fixtures/mod.rs

---
 tests/auth.rs          |  4 ++--
 tests/cli.rs           |  4 ++--
 tests/fixtures/mod.rs  | 37 +++++++++++++++++++++++++++++++++++++
 tests/helpers.rs       | 37 -------------------------------------
 tests/serve_request.rs |  4 ++--
 tests/upload_files.rs  |  4 ++--
 6 files changed, 45 insertions(+), 45 deletions(-)
 create mode 100644 tests/fixtures/mod.rs
 delete mode 100644 tests/helpers.rs

(limited to 'tests')

diff --git a/tests/auth.rs b/tests/auth.rs
index cefc7ec..48f070e 100644
--- a/tests/auth.rs
+++ b/tests/auth.rs
@@ -1,5 +1,5 @@
-mod helpers;
-use helpers::*;
+mod fixtures;
+use fixtures::*;
 
 #[rstest_parametrize(
     cli_auth_arg, client_username, client_password,
diff --git a/tests/cli.rs b/tests/cli.rs
index c021eb7..fe0f141 100644
--- a/tests/cli.rs
+++ b/tests/cli.rs
@@ -1,5 +1,5 @@
-mod helpers;
-use helpers::*;
+mod fixtures;
+use fixtures::*;
 
 #[test]
 /// Show help and exit.
diff --git a/tests/fixtures/mod.rs b/tests/fixtures/mod.rs
new file mode 100644
index 0000000..3c5ad72
--- /dev/null
+++ b/tests/fixtures/mod.rs
@@ -0,0 +1,37 @@
+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;
+
+/// Error type used by tests
+pub type Error = Box<std::error::Error>;
+
+/// File names for testing purpose
+pub static FILES: &[&str] = &["test.txt", "test.html", "test.mkv"];
+
+/// Test fixture which creates a temporary directory with a few files inside.
+pub fn tmpdir() -> TempDir {
+    let tmpdir = assert_fs::TempDir::new().expect("Couldn't create a temp dir for tests");
+    for &file in FILES {
+        tmpdir
+            .child(file)
+            .write_str("Test Hello Yes")
+            .expect("Couldn't write to file");
+    }
+    tmpdir
+}
+
+/// Get a free port.
+pub fn port() -> u16 {
+    free_local_port().expect("Couldn't find a free local port")
+}
diff --git a/tests/helpers.rs b/tests/helpers.rs
deleted file mode 100644
index 3c5ad72..0000000
--- a/tests/helpers.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-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;
-
-/// Error type used by tests
-pub type Error = Box<std::error::Error>;
-
-/// File names for testing purpose
-pub static FILES: &[&str] = &["test.txt", "test.html", "test.mkv"];
-
-/// Test fixture which creates a temporary directory with a few files inside.
-pub fn tmpdir() -> TempDir {
-    let tmpdir = assert_fs::TempDir::new().expect("Couldn't create a temp dir for tests");
-    for &file in FILES {
-        tmpdir
-            .child(file)
-            .write_str("Test Hello Yes")
-            .expect("Couldn't write to file");
-    }
-    tmpdir
-}
-
-/// Get a free port.
-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 10b2bfc..31b9b75 100644
--- a/tests/serve_request.rs
+++ b/tests/serve_request.rs
@@ -1,5 +1,5 @@
-mod helpers;
-use helpers::*;
+mod fixtures;
+use fixtures::*;
 
 #[rstest]
 fn serves_requests_with_no_options(tmpdir: TempDir) -> Result<(), Error> {
diff --git a/tests/upload_files.rs b/tests/upload_files.rs
index 4ebdb69..1bdecc3 100644
--- a/tests/upload_files.rs
+++ b/tests/upload_files.rs
@@ -1,5 +1,5 @@
-mod helpers;
-use helpers::*;
+mod fixtures;
+use fixtures::*;
 
 #[rstest]
 fn uploading_files_works(tmpdir: TempDir, port: u16) -> Result<(), Error> {
-- 
cgit v1.2.3