diff options
Diffstat (limited to 'tests/auth.rs')
| -rw-r--r-- | tests/auth.rs | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/tests/auth.rs b/tests/auth.rs index 0afaefd..4cabb77 100644 --- a/tests/auth.rs +++ b/tests/auth.rs @@ -5,14 +5,15 @@ use assert_fs::fixture::TempDir; use fixtures::{port, tmpdir, Error, FILES}; use pretty_assertions::assert_eq; use reqwest::StatusCode; -use rstest::{rstest, rstest_parametrize}; +use reqwest::blocking::Client; +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_parametrize( +#[rstest( cli_auth_arg, client_username, client_password, case("testuser:testpassword", "testuser", "testpassword"), case( @@ -44,7 +45,7 @@ fn auth_accepts( sleep(Duration::from_secs(1)); - let client = reqwest::Client::new(); + let client = Client::new(); let response = client .get(format!("http://localhost:{}", port).as_str()) .basic_auth(client_username, Some(client_password)) @@ -64,7 +65,7 @@ fn auth_accepts( Ok(()) } -#[rstest_parametrize( +#[rstest( cli_auth_arg, client_username, client_password, case("rightuser:rightpassword", "wronguser", "rightpassword"), case( @@ -108,7 +109,7 @@ fn auth_rejects( sleep(Duration::from_secs(1)); - let client = reqwest::Client::new(); + let client = Client::new(); let status = client .get(format!("http://localhost:{}", port).as_str()) .basic_auth(client_username, Some(client_password)) @@ -141,7 +142,7 @@ fn register_accounts<'a>(command: &'a mut Command) -> &'a mut Command { // pwd5 } -#[rstest_parametrize( +#[rstest( username, password, case("usr0", "pwd0"), @@ -166,7 +167,7 @@ fn auth_multiple_accounts_pass( sleep(Duration::from_secs(1)); - let client = reqwest::Client::new(); + let client = Client::new(); let response = client .get(format!("http://localhost:{}", port).as_str()) @@ -201,7 +202,7 @@ fn auth_multiple_accounts_wrong_username(tmpdir: TempDir, port: u16) -> Result<( sleep(Duration::from_secs(1)); - let client = reqwest::Client::new(); + let client = Client::new(); let status = client .get(format!("http://localhost:{}", port).as_str()) @@ -216,7 +217,7 @@ fn auth_multiple_accounts_wrong_username(tmpdir: TempDir, port: u16) -> Result<( Ok(()) } -#[rstest_parametrize( +#[rstest( username, password, case("usr0", "pwd5"), @@ -244,7 +245,7 @@ fn auth_multiple_accounts_wrong_password( sleep(Duration::from_secs(1)); - let client = reqwest::Client::new(); + let client = Client::new(); let status = client .get(format!("http://localhost:{}", port).as_str()) |