From dfd0ecf931b68ea373be1e4e785421d48ca6fed5 Mon Sep 17 00:00:00 2001 From: Ali MJ Al-Nasrawy Date: Sat, 24 Apr 2021 07:28:55 +0300 Subject: tests: Refactor! Remove duplicate code responsible for the initial setup and teardown of the test binary. This introduces `TestServer` as a resource manager for a running miniserve binary, which can be created with the fixtures `server()` and `server_no_stderr()` It also provides convenience function for handling server url. --- tests/qrcode.rs | 62 ++++++++++----------------------------------------------- 1 file changed, 10 insertions(+), 52 deletions(-) (limited to 'tests/qrcode.rs') diff --git a/tests/qrcode.rs b/tests/qrcode.rs index d9a5529..69d4edc 100644 --- a/tests/qrcode.rs +++ b/tests/qrcode.rs @@ -1,74 +1,35 @@ mod fixtures; -use assert_cmd::prelude::*; -use assert_fs::fixture::TempDir; -use fixtures::{port, tmpdir, Error}; +use fixtures::{server, server_no_stderr, Error, TestServer}; use reqwest::StatusCode; use rstest::rstest; use select::document::Document; use select::predicate::Attr; use std::iter::repeat_with; -use std::process::{Command, Stdio}; -use std::thread::sleep; -use std::time::Duration; #[rstest] -fn hide_qrcode_element(tmpdir: TempDir, port: u16) -> Result<(), Error> { - let mut child = Command::cargo_bin("miniserve")? - .arg(tmpdir.path()) - .arg("-p") - .arg(port.to_string()) - .stdout(Stdio::null()) - .spawn()?; - - sleep(Duration::from_secs(1)); - - let body = reqwest::blocking::get(format!("http://localhost:{}", port).as_str())? - .error_for_status()?; +fn hide_qrcode_element(server: TestServer) -> Result<(), Error> { + let body = reqwest::blocking::get(server.url())?.error_for_status()?; let parsed = Document::from_read(body)?; assert!(parsed.find(Attr("id", "qrcode")).next().is_none()); - child.kill()?; - Ok(()) } -#[rstest] -fn show_qrcode_element(tmpdir: TempDir, port: u16) -> Result<(), Error> { - let mut child = Command::cargo_bin("miniserve")? - .arg(tmpdir.path()) - .arg("-p") - .arg(port.to_string()) - .arg("-q") - .stdout(Stdio::null()) - .spawn()?; - - sleep(Duration::from_secs(1)); - - let body = reqwest::blocking::get(format!("http://localhost:{}", port).as_str())? - .error_for_status()?; +#[rstest(server(&["-q"]))] +fn show_qrcode_element(server: TestServer) -> Result<(), Error> { + let body = reqwest::blocking::get(server.url())?.error_for_status()?; let parsed = Document::from_read(body)?; assert!(parsed.find(Attr("id", "qrcode")).next().is_some()); - child.kill()?; - Ok(()) } #[rstest] -fn get_svg_qrcode(tmpdir: TempDir, port: u16) -> Result<(), Error> { - let mut child = Command::cargo_bin("miniserve")? - .arg(tmpdir.path()) - .arg("-p") - .arg(port.to_string()) - .stdout(Stdio::null()) - .stderr(Stdio::null()) - .spawn()?; - - sleep(Duration::from_secs(1)); - +fn get_svg_qrcode(server_no_stderr: TestServer) -> Result<(), Error> { + let server = server_no_stderr; // Ok - let resp = reqwest::blocking::get(format!("http://localhost:{}/?qrcode=test", port).as_str())?; + let resp = reqwest::blocking::get(server.url().join("/?qrcode=test")?)?; assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.headers()["Content-Type"], "image/svg+xml"); @@ -78,12 +39,9 @@ fn get_svg_qrcode(tmpdir: TempDir, port: u16) -> Result<(), Error> { // Err let content: String = repeat_with(|| '0').take(8 * 1024).collect(); - let resp = - reqwest::blocking::get(format!("http://localhost:{}/?qrcode={}", port, content).as_str())?; + let resp = reqwest::blocking::get(server.url().join(&format!("?qrcode={}", content))?)?; assert_eq!(resp.status(), StatusCode::URI_TOO_LONG); - child.kill()?; - Ok(()) } -- cgit v1.2.3 From 509ee380d188dcca9f9f7ba23e07e3c426382184 Mon Sep 17 00:00:00 2001 From: Ali MJ Al-Nasrawy Date: Thu, 26 Aug 2021 17:03:20 +0300 Subject: address comments --- tests/qrcode.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/qrcode.rs') diff --git a/tests/qrcode.rs b/tests/qrcode.rs index 69d4edc..e8a4153 100644 --- a/tests/qrcode.rs +++ b/tests/qrcode.rs @@ -26,8 +26,7 @@ fn show_qrcode_element(server: TestServer) -> Result<(), Error> { } #[rstest] -fn get_svg_qrcode(server_no_stderr: TestServer) -> Result<(), Error> { - let server = server_no_stderr; +fn get_svg_qrcode(#[from(server_no_stderr)] server: TestServer) -> Result<(), Error> { // Ok let resp = reqwest::blocking::get(server.url().join("/?qrcode=test")?)?; -- cgit v1.2.3 From 8dad9f620572ab1371f93bcdd10c8d2e8d3686ec Mon Sep 17 00:00:00 2001 From: Ali MJ Al-Nasrawy Date: Thu, 26 Aug 2021 18:38:13 +0300 Subject: new partial-injection syntax --- tests/qrcode.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/qrcode.rs') diff --git a/tests/qrcode.rs b/tests/qrcode.rs index e8a4153..a9c27fe 100644 --- a/tests/qrcode.rs +++ b/tests/qrcode.rs @@ -16,8 +16,8 @@ fn hide_qrcode_element(server: TestServer) -> Result<(), Error> { Ok(()) } -#[rstest(server(&["-q"]))] -fn show_qrcode_element(server: TestServer) -> Result<(), Error> { +#[rstest] +fn show_qrcode_element(#[with(&["-q"])] server: TestServer) -> Result<(), Error> { let body = reqwest::blocking::get(server.url())?.error_for_status()?; let parsed = Document::from_read(body)?; assert!(parsed.find(Attr("id", "qrcode")).next().is_some()); -- cgit v1.2.3