Store `Message` instances using their events.

I found a test bug! The tests for deleting previously-deleted or previously-expired tests were using the wrong user to try to delete those messages. The tests happened to pass anyways because the message authorship check was done after the message lifecycle check. They would have no longer passed; the tests are fixed to use the sender, instead.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/message/handlers/delete/test.rs b/src/message/handlers/delete/test.rs
index d0e1794..05d9344 100644
--- a/src/message/handlers/delete/test.rs
+++ b/src/message/handlers/delete/test.rs
@@ -70,23 +70,23 @@ pub async fn delete_deleted() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let sender = fixtures::user::create(&app, &fixtures::now()).await;
+    let sender = fixtures::identity::create(&app, &fixtures::now()).await;
     let conversation = fixtures::conversation::create(&app, &fixtures::now()).await;
-    let message = fixtures::message::send(&app, &conversation, &sender, &fixtures::now()).await;
+    let message =
+        fixtures::message::send(&app, &conversation, &sender.login, &fixtures::now()).await;
 
     app.messages()
-        .delete(&sender, &message.id, &fixtures::now())
+        .delete(&sender.login, &message.id, &fixtures::now())
         .await
         .expect("deleting a recently-sent message succeeds");
 
     // Send the request
 
-    let deleter = fixtures::identity::create(&app, &fixtures::now()).await;
     let super::Error(error) = super::handler(
         State(app.clone()),
         Path(message.id.clone()),
         fixtures::now(),
-        deleter,
+        sender,
     )
     .await
     .expect_err("deleting a deleted message fails");
@@ -101,9 +101,10 @@ pub async fn delete_expired() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let sender = fixtures::user::create(&app, &fixtures::ancient()).await;
+    let sender = fixtures::identity::create(&app, &fixtures::ancient()).await;
     let conversation = fixtures::conversation::create(&app, &fixtures::ancient()).await;
-    let message = fixtures::message::send(&app, &conversation, &sender, &fixtures::ancient()).await;
+    let message =
+        fixtures::message::send(&app, &conversation, &sender.login, &fixtures::ancient()).await;
 
     app.messages()
         .expire(&fixtures::now())
@@ -112,12 +113,11 @@ pub async fn delete_expired() {
 
     // Send the request
 
-    let deleter = fixtures::identity::create(&app, &fixtures::now()).await;
     let super::Error(error) = super::handler(
         State(app.clone()),
         Path(message.id.clone()),
         fixtures::now(),
-        deleter,
+        sender,
     )
     .await
     .expect_err("deleting an expired message fails");