From 03a746431e4f39c7168ba110845b004682a15bf1 Mon Sep 17 00:00:00 2001 From: glyph Date: Mon, 15 Nov 2021 17:32:30 +0200 Subject: [PATCH] update tests --- peach-web/src/tests.rs | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/peach-web/src/tests.rs b/peach-web/src/tests.rs index 931af3e..251de09 100644 --- a/peach-web/src/tests.rs +++ b/peach-web/src/tests.rs @@ -47,15 +47,15 @@ fn index_html() { assert!(body.contains("/peers")); assert!(body.contains("/profile")); assert!(body.contains("/private")); - assert!(body.contains("/device")); + assert!(body.contains("/status")); assert!(body.contains("/help")); - assert!(body.contains("/network")); + assert!(body.contains("/settings")); } #[test] fn network_card_html() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); - let response = client.get("/network").dispatch(); + 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(); @@ -73,7 +73,7 @@ fn network_card_html() { #[test] fn network_list_html() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); - let response = client.get("/network/wifi").dispatch(); + let response = client.get("/settings/network/wifi").dispatch(); assert_eq!(response.status(), Status::Ok); assert_eq!(response.content_type(), Some(ContentType::HTML)); let body = response.into_string().unwrap(); @@ -85,7 +85,7 @@ fn network_list_html() { #[test] fn network_detail_html() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); - let response = client.get("/network/wifi?ssid=Home").dispatch(); + let response = client.get("/settings/network/wifi?ssid=Home").dispatch(); assert_eq!(response.status(), Status::Ok); assert_eq!(response.content_type(), Some(ContentType::HTML)); //let body = response.into_string().unwrap(); @@ -95,7 +95,7 @@ fn network_detail_html() { #[test] fn network_add_html() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); - let response = client.get("/network/wifi/add").dispatch(); + let response = client.get("/settings/network/wifi/add").dispatch(); assert_eq!(response.status(), Status::Ok); assert_eq!(response.content_type(), Some(ContentType::HTML)); let body = response.into_string().unwrap(); @@ -109,7 +109,9 @@ fn network_add_html() { #[test] fn network_add_ssid_html() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); - let response = client.get("/network/wifi/add?ssid=Home").dispatch(); + let response = client + .get("/settings/network/wifi/add?ssid=Home") + .dispatch(); assert_eq!(response.status(), Status::Ok); assert_eq!(response.content_type(), Some(ContentType::HTML)); let body = response.into_string().unwrap(); @@ -121,9 +123,9 @@ fn network_add_ssid_html() { } #[test] -fn device_html() { +fn status_html() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); - let response = client.get("/device").dispatch(); + let response = client.get("/status").dispatch(); assert_eq!(response.status(), Status::Ok); assert_eq!(response.content_type(), Some(ContentType::HTML)); let body = response.into_string().unwrap(); @@ -269,9 +271,9 @@ fn profile_html() { } #[test] -fn shutdown_html() { +fn power_html() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); - let response = client.get("/shutdown").dispatch(); + let response = client.get("/power").dispatch(); assert_eq!(response.status(), Status::Ok); assert_eq!(response.content_type(), Some(ContentType::HTML)); let body = response.into_string().unwrap(); @@ -281,7 +283,7 @@ fn shutdown_html() { #[test] fn network_usage_html() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); - let response = client.get("/network/wifi/usage").dispatch(); + let response = client.get("/settings/network/wifi/usage").dispatch(); assert_eq!(response.status(), Status::Ok); assert_eq!(response.content_type(), Some(ContentType::HTML)); let body = response.into_string().unwrap(); @@ -295,7 +297,7 @@ fn network_usage_html() { fn add_credentials() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); let response = client - .post("/network/wifi/add") + .post("/settings/network/wifi/add") .header(ContentType::Form) .body("ssid=Home&pass=Password") .dispatch(); @@ -307,7 +309,7 @@ fn add_credentials() { fn forget_wifi() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); let response = client - .post("/network/wifi/forget") + .post("/settings/network/wifi/forget") .header(ContentType::Form) .body("ssid=Home") .dispatch(); @@ -319,7 +321,7 @@ fn forget_wifi() { fn modify_password() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); let response = client - .post("/network/wifi/modify") + .post("/settings/network/wifi/modify") .header(ContentType::Form) .body("ssid=Home&pass=Password") .dispatch(); @@ -330,7 +332,7 @@ fn modify_password() { #[test] fn deploy_ap() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); - let response = client.get("/network/ap/activate").dispatch(); + let response = client.get("/settings/network/ap/activate").dispatch(); // check for 303 status (redirect) assert_eq!(response.status(), Status::SeeOther); assert_eq!(response.content_type(), None); @@ -339,7 +341,7 @@ fn deploy_ap() { #[test] fn deploy_client() { let client = Client::tracked(init_rocket()).expect("valid rocket instance"); - let response = client.get("/network/wifi/activate").dispatch(); + let response = client.get("/settings/network/wifi/activate").dispatch(); // check for 303 status (redirect) assert_eq!(response.status(), Status::SeeOther); assert_eq!(response.content_type(), None);