From 3747204267e8b75bc77d6c0962b67bbe018dad15 Mon Sep 17 00:00:00 2001 From: Joel Klinghed Date: Thu, 9 Jan 2025 21:20:17 +0100 Subject: Add string id for project and reduce usage of numeric ids in general User: username must be unique, use as primary key and drop id. --- server/src/tests.rs | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'server/src/tests.rs') diff --git a/server/src/tests.rs b/server/src/tests.rs index ca7217b..72bdd78 100644 --- a/server/src/tests.rs +++ b/server/src/tests.rs @@ -180,7 +180,7 @@ async fn get_users<'a>(client: &Client) -> api_model::Users { async fn new_project(client: &Client) -> api_model::Project { get_project_from( client - .post("/api/v1/project/new") + .post("/api/v1/project/test/new") .json(&api_model::ProjectData { title: Some("foo"), description: Some("bar"), @@ -281,13 +281,14 @@ async fn test_project_new() { let project = new_project(&client).await; + assert_eq!(project.id, "test"); assert_eq!(project.title, "foo"); assert_eq!(project.description, "bar"); assert_eq!(project.remote, "fum"); assert_eq!(project.main_branch, "zod"); assert_eq!(project.users.len(), 1); let user = project.users.get(0).unwrap(); - assert_eq!(user.user.username, "user"); + assert_eq!(user.user.id, "user"); assert_eq!(user.default_role, api_model::UserReviewRole::Reviewer); assert_eq!(user.maintainer, true); @@ -309,7 +310,7 @@ async fn test_project_update() { login(&client).await; - let project = get_project_from(client.post("/api/v1/project/new").json( + let project = get_project_from(client.post("/api/v1/project/test/new").json( &api_model::ProjectData { title: Some("foo"), description: None, @@ -351,10 +352,10 @@ async fn test_project_new_user() { let project_url = format!("/api/v1/project/{}", project.id); let users = get_users(&client).await; - let other = users.users.iter().find(|u| u.username == "other").unwrap(); + let other = users.users.iter().find(|u| u.id == "other").unwrap(); let new = client - .post(format!("{project_url}/user/new?userid={}", other.id)) + .post(format!("{project_url}/user/{}/new", other.id)) .json(&api_model::ProjectUserEntryData { default_role: Some(api_model::UserReviewRole::Watcher), maintainer: Some(true), @@ -386,11 +387,11 @@ async fn test_project_change_user() { let project_url = format!("/api/v1/project/{}", project.id); let users = get_users(&client).await; - let user = users.users.iter().find(|u| u.username == "user").unwrap(); - let other = users.users.iter().find(|u| u.username == "other").unwrap(); + let user = users.users.iter().find(|u| u.id == "user").unwrap(); + let other = users.users.iter().find(|u| u.id == "other").unwrap(); let new = client - .post(format!("{project_url}/user/new?userid={}", other.id)) + .post(format!("{project_url}/user/{}/new", other.id)) .json(&api_model::ProjectUserEntryData { default_role: Some(api_model::UserReviewRole::Watcher), maintainer: Some(true), @@ -433,11 +434,11 @@ async fn test_project_check_maintainer() { let project_url = format!("/api/v1/project/{}", project.id); let users = get_users(&client).await; - let user = users.users.iter().find(|u| u.username == "user").unwrap(); - let other = users.users.iter().find(|u| u.username == "other").unwrap(); + let user = users.users.iter().find(|u| u.id == "user").unwrap(); + let other = users.users.iter().find(|u| u.id == "other").unwrap(); let new = client - .post(format!("{project_url}/user/new?userid={}", other.id)) + .post(format!("{project_url}/user/{}/new", other.id)) .json(&api_model::ProjectUserEntryData { default_role: Some(api_model::UserReviewRole::Watcher), maintainer: Some(true), @@ -485,11 +486,11 @@ async fn test_project_dont_check_maintainer() { let project_url = format!("/api/v1/project/{}", project.id); let users = get_users(&client).await; - let user = users.users.iter().find(|u| u.username == "user").unwrap(); - let other = users.users.iter().find(|u| u.username == "other").unwrap(); + let user = users.users.iter().find(|u| u.id == "user").unwrap(); + let other = users.users.iter().find(|u| u.id == "other").unwrap(); let new = client - .post(format!("{project_url}/user/new?userid={}", other.id)) + .post(format!("{project_url}/user/{}/new", other.id)) .json(&api_model::ProjectUserEntryData { default_role: Some(api_model::UserReviewRole::Watcher), maintainer: Some(true), @@ -545,11 +546,11 @@ async fn test_project_delete_user() { let project_url = format!("/api/v1/project/{}", project.id); let users = get_users(&client).await; - let user = users.users.iter().find(|u| u.username == "user").unwrap(); - let other = users.users.iter().find(|u| u.username == "other").unwrap(); + let user = users.users.iter().find(|u| u.id == "user").unwrap(); + let other = users.users.iter().find(|u| u.id == "other").unwrap(); let new = client - .post(format!("{project_url}/user/new?userid={}", other.id)) + .post(format!("{project_url}/user/{}/new", other.id)) .json(&api_model::ProjectUserEntryData { default_role: Some(api_model::UserReviewRole::Watcher), maintainer: Some(true), -- cgit v1.2.3-70-g09d2