1 files changed, 10 insertions, 18 deletions
diff --git a/src/invite/handlers/accept/test.rs b/src/invite/handlers/accept/test.rs
index adc7aa4..283ec76 100644
--- a/src/invite/handlers/accept/test.rs
+++ b/src/invite/handlers/accept/test.rs
@@ -1,6 +1,11 @@
 use axum::extract::{Json, Path, State};
 
-use crate::{empty::Empty, invite::app::AcceptError, name::Name, test::fixtures};
+use crate::{
+    empty::Empty,
+    invite::app::AcceptError,
+    name::Name,
+    test::{fixtures, verify},
+};
 
 #[tokio::test]
 async fn valid_invite() {
@@ -34,29 +39,16 @@ async fn valid_invite() {
 
     // Verify that the issued token is valid
 
-    let secret = identity
-        .secret()
-        .expect("newly-issued identity has a token secret");
-    let (_, login) = app
-        .tokens()
-        .validate(&secret, &fixtures::now())
-        .await
-        .expect("newly-issued identity cookie is valid");
-    assert_eq!(name, login.name);
+    verify::identity::valid_for_name(&app, &identity, &name).await;
 
     // Verify that the given credentials can log in
 
     let secret = app
-        .tokens()
-        .login(&name, &password, &fixtures::now())
+        .logins()
+        .with_password(&name, &password, &fixtures::now())
         .await
         .expect("credentials given on signup are valid");
-    let (_, login) = app
-        .tokens()
-        .validate(&secret, &fixtures::now())
-        .await
-        .expect("validating a newly-issued token secret succeeds");
-    assert_eq!(name, login.name);
+    verify::token::valid_for_name(&app, &secret, &name).await;
 }
 
 #[tokio::test]