From 562b62a0b638d2ca0731f83476a2e5f74757962a Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Sat, 13 Jan 2024 06:11:59 +0100 Subject: Clean up default order function I removed the stringly typing as we already have enums for this that we can make use of. --- tests/navigation.rs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'tests/navigation.rs') diff --git a/tests/navigation.rs b/tests/navigation.rs index b921d4c..734424a 100644 --- a/tests/navigation.rs +++ b/tests/navigation.rs @@ -7,7 +7,7 @@ use rstest::rstest; use select::document::Document; use std::process::{Command, Stdio}; use utils::get_link_from_text; -use utils::get_link_hrefs_from_text_with_prefix; +use utils::get_link_hrefs_with_prefix; #[rstest( input, @@ -154,22 +154,18 @@ fn can_navigate_using_breadcrumbs( #[case(server(&["--default-sorting-method", "date", "--default-sorting-order", "asc"]))] /// We can specify the default sorting order fn can_specify_default_sorting_order(#[case] server: TestServer) -> Result<(), Error> { - let slash = String::from("/"); - let base_url = server.url(); - let nested_url = base_url.join(&slash)?; - - let resp = reqwest::blocking::get(nested_url.as_str())?; + let resp = reqwest::blocking::get(server.url())?; let body = resp.error_for_status()?; let parsed = Document::from_read(body)?; - let links = get_link_hrefs_from_text_with_prefix(&parsed, "/"); - let first_created_file = slash + FILES.first().unwrap(); + let links = get_link_hrefs_with_prefix(&parsed, "/"); + let first_created_file = FILES.first().unwrap(); - if links.first().unwrap() == &first_created_file { + if links.first().unwrap() == first_created_file { assert_eq!("/very/?sort=date&order=asc", links.last().unwrap()); } - if links.last().unwrap() == &first_created_file { + if links.last().unwrap() == first_created_file { assert_eq!("/very/?sort=date&order=desc", links.first().unwrap()); } -- cgit v1.2.3