From 5e4e052c400bb88933125f3549cec6dc12a9d09b Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Sun, 23 Mar 2025 19:06:43 -0400
Subject: Rename `login` to `user` throughout the server

---
 src/test/fixtures/event.rs    |  6 ++---
 src/test/fixtures/identity.rs |  4 ++--
 src/test/fixtures/login.rs    | 51 -------------------------------------------
 src/test/fixtures/mod.rs      |  2 +-
 src/test/fixtures/user.rs     | 51 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 57 insertions(+), 57 deletions(-)
 delete mode 100644 src/test/fixtures/login.rs
 create mode 100644 src/test/fixtures/user.rs

(limited to 'src/test')

diff --git a/src/test/fixtures/event.rs b/src/test/fixtures/event.rs
index c6e5337..a30bb4b 100644
--- a/src/test/fixtures/event.rs
+++ b/src/test/fixtures/event.rs
@@ -16,9 +16,9 @@ pub fn message(event: Event) -> Ready<Option<message::Event>> {
     })
 }
 
-pub fn login(event: Event) -> Ready<Option<login::Event>> {
+pub fn user(event: Event) -> Ready<Option<user::Event>> {
     future::ready(match event {
-        Event::Login(event) => Some(event),
+        Event::User(event) => Some(event),
         _ => None,
     })
 }
@@ -65,7 +65,7 @@ pub mod message {
     }
 }
 
-pub mod login {
+pub mod user {
     use std::future::{self, Ready};
 
     pub use crate::user::Event;
diff --git a/src/test/fixtures/identity.rs b/src/test/fixtures/identity.rs
index 7611066..0b2f978 100644
--- a/src/test/fixtures/identity.rs
+++ b/src/test/fixtures/identity.rs
@@ -11,7 +11,7 @@ use crate::{
 };
 
 pub async fn create(app: &App, created_at: &RequestedAt) -> Identity {
-    let credentials = fixtures::login::create_with_password(app, created_at).await;
+    let credentials = fixtures::user::create_with_password(app, created_at).await;
     logged_in(app, &credentials, created_at).await
 }
 
@@ -41,7 +41,7 @@ pub async fn logged_in(
 
 pub fn fictitious() -> Identity {
     let token = token::Id::generate();
-    let login = fixtures::login::fictitious();
+    let login = fixtures::user::fictitious();
 
     Identity { token, user: login }
 }
diff --git a/src/test/fixtures/login.rs b/src/test/fixtures/login.rs
deleted file mode 100644
index e668c95..0000000
--- a/src/test/fixtures/login.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use faker_rand::{en_us::internet, lorem::Paragraphs};
-use uuid::Uuid;
-
-use crate::{
-    app::App,
-    clock::RequestedAt,
-    name::Name,
-    user::{self, Password, User},
-};
-
-pub async fn create_with_password(app: &App, created_at: &RequestedAt) -> (Name, Password) {
-    let (name, password) = propose();
-    let login = app
-        .users()
-        .create(&name, &password, created_at)
-        .await
-        .expect("should always succeed if the login is actually new");
-
-    (login.name, password)
-}
-
-pub async fn create(app: &App, created_at: &RequestedAt) -> User {
-    let (name, password) = propose();
-    app.users()
-        .create(&name, &password, created_at)
-        .await
-        .expect("should always succeed if the login is actually new")
-}
-
-pub fn fictitious() -> User {
-    User {
-        id: user::Id::generate(),
-        name: propose_name(),
-    }
-}
-
-pub fn propose() -> (Name, Password) {
-    (propose_name(), propose_password())
-}
-
-pub fn propose_invalid_name() -> Name {
-    rand::random::<Paragraphs>().to_string().into()
-}
-
-fn propose_name() -> Name {
-    rand::random::<internet::Username>().to_string().into()
-}
-
-pub fn propose_password() -> Password {
-    Uuid::new_v4().to_string().into()
-}
diff --git a/src/test/fixtures/mod.rs b/src/test/fixtures/mod.rs
index 57eee30..418bdb5 100644
--- a/src/test/fixtures/mod.rs
+++ b/src/test/fixtures/mod.rs
@@ -9,8 +9,8 @@ pub mod event;
 pub mod future;
 pub mod identity;
 pub mod invite;
-pub mod login;
 pub mod message;
+pub mod user;
 
 pub async fn scratch_app() -> App {
     let pool = db::prepare("sqlite::memory:", "sqlite::memory:")
diff --git a/src/test/fixtures/user.rs b/src/test/fixtures/user.rs
new file mode 100644
index 0000000..e668c95
--- /dev/null
+++ b/src/test/fixtures/user.rs
@@ -0,0 +1,51 @@
+use faker_rand::{en_us::internet, lorem::Paragraphs};
+use uuid::Uuid;
+
+use crate::{
+    app::App,
+    clock::RequestedAt,
+    name::Name,
+    user::{self, Password, User},
+};
+
+pub async fn create_with_password(app: &App, created_at: &RequestedAt) -> (Name, Password) {
+    let (name, password) = propose();
+    let login = app
+        .users()
+        .create(&name, &password, created_at)
+        .await
+        .expect("should always succeed if the login is actually new");
+
+    (login.name, password)
+}
+
+pub async fn create(app: &App, created_at: &RequestedAt) -> User {
+    let (name, password) = propose();
+    app.users()
+        .create(&name, &password, created_at)
+        .await
+        .expect("should always succeed if the login is actually new")
+}
+
+pub fn fictitious() -> User {
+    User {
+        id: user::Id::generate(),
+        name: propose_name(),
+    }
+}
+
+pub fn propose() -> (Name, Password) {
+    (propose_name(), propose_password())
+}
+
+pub fn propose_invalid_name() -> Name {
+    rand::random::<Paragraphs>().to_string().into()
+}
+
+fn propose_name() -> Name {
+    rand::random::<internet::Username>().to_string().into()
+}
+
+pub fn propose_password() -> Password {
+    Uuid::new_v4().to_string().into()
+}
-- 
cgit v1.2.3