From 1eb026aa2c04a5cbb4919ec02e87b9f4c87b0350 Mon Sep 17 00:00:00 2001 From: Sebastian Pravda Date: Mon, 21 Nov 2022 18:01:42 +0100 Subject: [PATCH] fix: remove duplicate admin_login function --- api/src/routes/admin.rs | 4 ++-- api/src/routes/candidate.rs | 21 +-------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/api/src/routes/admin.rs b/api/src/routes/admin.rs index a3d6efc..1e9daaa 100644 --- a/api/src/routes/admin.rs +++ b/api/src/routes/admin.rs @@ -159,12 +159,12 @@ pub async fn get_candidate_portfolio( } #[cfg(test)] -mod tests { +pub mod tests { use rocket::{local::blocking::Client, http::{Cookie, Status}}; use crate::test::tests::{test_client, ADMIN_PASSWORD, ADMIN_ID}; - fn admin_login(client: &Client) -> (Cookie, Cookie) { + pub fn admin_login(client: &Client) -> (Cookie, Cookie) { let response = client .post("/admin/login") .body(format!( diff --git a/api/src/routes/candidate.rs b/api/src/routes/candidate.rs index e83252a..3309d76 100644 --- a/api/src/routes/candidate.rs +++ b/api/src/routes/candidate.rs @@ -289,7 +289,7 @@ mod tests { local::blocking::Client, }; - use crate::test::tests::{test_client, APPLICATION_ID, CANDIDATE_PASSWORD, ADMIN_PASSWORD, ADMIN_ID}; + use crate::{test::tests::{test_client, APPLICATION_ID, CANDIDATE_PASSWORD}, routes::admin::tests::admin_login}; fn candidate_login(client: &Client) -> (Cookie, Cookie) { let response = client @@ -309,25 +309,6 @@ mod tests { ) } - fn admin_login(client: &Client) -> (Cookie, Cookie) { - let response = client - .post("/admin/login") - .body(format!( - "{{ - \"admin_id\": {}, - \"password\": \"{}\" - }}", - ADMIN_ID, ADMIN_PASSWORD - )) - .dispatch(); - - println!("{:?}", response); - ( - response.cookies().get("id").unwrap().to_owned(), - response.cookies().get("key").unwrap().to_owned(), - ) - } - const CANDIDATE_DETAILS: &'static str = "{ \"name\": \"idk\", \"surname\": \"idk\",