1 files changed, 7 insertions, 23 deletions
diff --git a/src/setup/handlers/setup/test.rs b/src/setup/handlers/setup/test.rs
index 4a37690..283fe8b 100644
--- a/src/setup/handlers/setup/test.rs
+++ b/src/setup/handlers/setup/test.rs
@@ -1,6 +1,10 @@
 use axum::extract::{Json, State};
 
-use crate::{empty::Empty, setup::app, test::fixtures};
+use crate::{
+    empty::Empty,
+    setup::app,
+    test::{fixtures, verify},
+};
 
 #[tokio::test]
 async fn fresh_instance() {
@@ -21,30 +25,10 @@ async fn fresh_instance() {
             .expect("setup in a fresh app succeeds");
 
     // 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())
-        .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::login::valid_login(&app, &name, &password).await;
 }
 
 #[tokio::test]