Merge branch 'main' into wip/mobile

1 files changed, 10 insertions, 8 deletions

diff --git a/src/test/fixtures/login.rs b/src/test/fixtures/login.rs
index e5ac716..e308289 100644
--- a/src/test/fixtures/login.rs
+++ b/src/test/fixtures/login.rs
@@ -5,16 +5,18 @@ use crate::{
     app::App,
     clock::RequestedAt,
     login::{self, Login, Password},
+    name::Name,
 };
 
-pub async fn create_with_password(app: &App, created_at: &RequestedAt) -> (String, Password) {
+pub async fn create_with_password(app: &App, created_at: &RequestedAt) -> (Name, Password) {
     let (name, password) = propose();
-    app.logins()
+    let login = app
+        .logins()
         .create(&name, &password, created_at)
         .await
         .expect("should always succeed if the login is actually new");
 
-    (name, password)
+    (login.name, password)
 }
 
 pub async fn create(app: &App, created_at: &RequestedAt) -> Login {
@@ -28,16 +30,16 @@ pub async fn create(app: &App, created_at: &RequestedAt) -> Login {
 pub fn fictitious() -> Login {
     Login {
         id: login::Id::generate(),
-        name: name(),
+        name: propose_name(),
     }
 }
 
-pub fn propose() -> (String, Password) {
-    (name(), propose_password())
+pub fn propose() -> (Name, Password) {
+    (propose_name(), propose_password())
 }
 
-fn name() -> String {
-    rand::random::<internet::Username>().to_string()
+fn propose_name() -> Name {
+    rand::random::<internet::Username>().to_string().into()
 }
 
 pub fn propose_password() -> Password {