From e69c2ff855c0c93b3e8c4428add4c4a27dc4973e Mon Sep 17 00:00:00 2001 From: glyph Date: Tue, 16 Nov 2021 15:50:22 +0200 Subject: [PATCH] update network status html tests --- peach-web/src/tests.rs | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/peach-web/src/tests.rs b/peach-web/src/tests.rs index 251de09f..18365cc4 100644 --- a/peach-web/src/tests.rs +++ b/peach-web/src/tests.rs @@ -53,25 +53,17 @@ fn index_html() { } #[test] -fn network_card_html() { +fn network_settings_menu_html() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); let response = client.get("/settings/network").dispatch(); assert_eq!(response.status(), Status::Ok); assert_eq!(response.content_type(), Some(ContentType::HTML)); let body = response.into_string().unwrap(); - assert!(body.contains("MODE")); - assert!(body.contains("SSID")); - assert!(body.contains("IP")); - assert!(body.contains("Add WiFi Network")); - assert!(body.contains("Deploy Access Point")); - assert!(body.contains("List WiFi Networks")); - assert!(body.contains("SIGNAL")); - assert!(body.contains("DOWNLOAD")); - assert!(body.contains("UPLOAD")); + assert!(body.contains("Network Configuration")); } #[test] -fn network_list_html() { +fn list_aps_html() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); let response = client.get("/settings/network/wifi").dispatch(); assert_eq!(response.status(), Status::Ok); @@ -83,7 +75,7 @@ fn network_list_html() { // TODO: needs further testing once template has been refactored #[test] -fn network_detail_html() { +fn ap_details_html() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); let response = client.get("/settings/network/wifi?ssid=Home").dispatch(); assert_eq!(response.status(), Status::Ok); @@ -93,7 +85,7 @@ fn network_detail_html() { } #[test] -fn network_add_html() { +fn add_ap_html() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); let response = client.get("/settings/network/wifi/add").dispatch(); assert_eq!(response.status(), Status::Ok); @@ -107,7 +99,7 @@ fn network_add_html() { } #[test] -fn network_add_ssid_html() { +fn add_ap_ssid_html() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); let response = client .get("/settings/network/wifi/add?ssid=Home") @@ -281,7 +273,7 @@ fn power_html() { } #[test] -fn network_usage_html() { +fn data_usage_html() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); let response = client.get("/settings/network/wifi/usage").dispatch(); assert_eq!(response.status(), Status::Ok);