aboutsummaryrefslogtreecommitdiffstats
path: root/tests/archive.rs
diff options
context:
space:
mode:
authorSven-Hendrik Haase <svenstaro@gmail.com>2020-03-11 14:39:12 +0000
committerSven-Hendrik Haase <svenstaro@gmail.com>2020-03-11 14:39:12 +0000
commit50b7dc6d07a70481bf3efa8aa256e134ec42adbd (patch)
tree9c7a72d2357186f9a152b6ace5690c3520feebae /tests/archive.rs
parentMerge pull request #235 from DamianX/archives (diff)
downloadminiserve-50b7dc6d07a70481bf3efa8aa256e134ec42adbd.tar.gz
miniserve-50b7dc6d07a70481bf3efa8aa256e134ec42adbd.zip
Fix tests for reqwests v0.10
Diffstat (limited to '')
-rw-r--r--tests/archive.rs25
1 files changed, 14 insertions, 11 deletions
diff --git a/tests/archive.rs b/tests/archive.rs
index c692d90..e4cca81 100644
--- a/tests/archive.rs
+++ b/tests/archive.rs
@@ -3,13 +3,13 @@
use assert_cmd::prelude::*;
use assert_fs::fixture::TempDir;
use fixtures::{port, tmpdir, Error};
+use reqwest::StatusCode;
use rstest::rstest;
use select::document::Document;
use select::predicate::Text;
use std::process::{Command, Stdio};
use std::thread::sleep;
use std::time::Duration;
-use reqwest::StatusCode;
#[rstest]
fn archives_are_disabled(tmpdir: TempDir, port: u16) -> Result<(), Error> {
@@ -24,23 +24,26 @@ fn archives_are_disabled(tmpdir: TempDir, port: u16) -> Result<(), Error> {
sleep(Duration::from_secs(1));
// Ensure the links to the archives are not present
- let body = reqwest::get(format!("http://localhost:{}", port).as_str())?.error_for_status()?;
+ let body = reqwest::blocking::get(format!("http://localhost:{}", port).as_str())?
+ .error_for_status()?;
let parsed = Document::from_read(body)?;
- assert!(parsed.find(Text).all(|x| x.text() != "Download .tar.gz" && x.text() != "Download .tar"));
-
+ assert!(parsed
+ .find(Text)
+ .all(|x| x.text() != "Download .tar.gz" && x.text() != "Download .tar"));
+
// Try to download anyway, ensure it's forbidden
assert_eq!(
- reqwest::get(
- format!("http://localhost:{}/?download=tar_gz", port).as_str())?
+ reqwest::blocking::get(format!("http://localhost:{}/?download=tar_gz", port).as_str())?
.status(),
- StatusCode::FORBIDDEN);
+ StatusCode::FORBIDDEN
+ );
assert_eq!(
- reqwest::get(
- format!("http://localhost:{}/?download=tar", port).as_str())?
+ reqwest::blocking::get(format!("http://localhost:{}/?download=tar", port).as_str())?
.status(),
- StatusCode::FORBIDDEN);
+ StatusCode::FORBIDDEN
+ );
child.kill()?;
Ok(())
-} \ No newline at end of file
+}