Merge branch 'prop/rename-login-to-user'

2 files changed, 7 insertions, 7 deletions

diff --git a/src/message/routes/message/mod.rs b/src/message/routes/message/mod.rs
index e92f556..4abd445 100644
--- a/src/message/routes/message/mod.rs
+++ b/src/message/routes/message/mod.rs
@@ -23,7 +23,7 @@ pub mod delete {
         identity: Identity,
     ) -> Result<Response, Error> {
         app.messages()
-            .delete(&identity.login, &message, &deleted_at)
+            .delete(&identity.user, &message, &deleted_at)
             .await?;
 
         Ok(Response { id: message })
diff --git a/src/message/routes/message/test.rs b/src/message/routes/message/test.rs
index 5178ab5..1888be7 100644
--- a/src/message/routes/message/test.rs
+++ b/src/message/routes/message/test.rs
@@ -10,7 +10,7 @@ pub async fn delete_message() {
     let app = fixtures::scratch_app().await;
     let sender = fixtures::identity::create(&app, &fixtures::now()).await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
-    let message = fixtures::message::send(&app, &channel, &sender.login, &fixtures::now()).await;
+    let message = fixtures::message::send(&app, &channel, &sender.user, &fixtures::now()).await;
 
     // Send the request
 
@@ -62,7 +62,7 @@ pub async fn delete_deleted() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
     let message = fixtures::message::send(&app, &channel, &sender, &fixtures::now()).await;
 
@@ -93,7 +93,7 @@ pub async fn delete_expired() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let sender = fixtures::login::create(&app, &fixtures::ancient()).await;
+    let sender = fixtures::user::create(&app, &fixtures::ancient()).await;
     let channel = fixtures::channel::create(&app, &fixtures::ancient()).await;
     let message = fixtures::message::send(&app, &channel, &sender, &fixtures::ancient()).await;
 
@@ -124,7 +124,7 @@ pub async fn delete_purged() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let sender = fixtures::login::create(&app, &fixtures::ancient()).await;
+    let sender = fixtures::user::create(&app, &fixtures::ancient()).await;
     let channel = fixtures::channel::create(&app, &fixtures::ancient()).await;
     let message = fixtures::message::send(&app, &channel, &sender, &fixtures::ancient()).await;
 
@@ -160,7 +160,7 @@ pub async fn delete_not_sender() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
     let message = fixtures::message::send(&app, &channel, &sender, &fixtures::now()).await;
 
@@ -179,6 +179,6 @@ pub async fn delete_not_sender() {
     // Verify the response
 
     assert!(
-        matches!(error, app::DeleteError::NotSender(error_sender) if deleter.login == error_sender)
+        matches!(error, app::DeleteError::NotSender(error_sender) if deleter.user == error_sender)
     );
 }