Convert the last stray tests to be generic over components deriveable from an App.

There are a few places in the test fixtures that still call `App` methods directly, as they call `app.users()` (which, as per previous commits, has no `FromRef` impl).

1 files changed, 15 insertions, 8 deletions

diff --git a/src/test/verify/login.rs b/src/test/verify/login.rs
index ae2e91e..aad01bc 100644
--- a/src/test/verify/login.rs
+++ b/src/test/verify/login.rs
@@ -1,23 +1,30 @@
+use axum::extract::FromRef;
+
 use crate::{
-    app::App,
-    login::app::LoginError,
+    login::app::{LoginError, Logins},
     name::Name,
     password::Password,
     test::{fixtures, verify},
+    token::app::Tokens,
 };
 
-pub async fn valid_login(app: &App, name: &Name, password: &Password) {
-    let secret = app
-        .logins()
+pub async fn valid_login<App>(app: &App, name: &Name, password: &Password)
+where
+    Logins: FromRef<App>,
+    Tokens: FromRef<App>,
+{
+    let secret = Logins::from_ref(app)
         .with_password(name, password, &fixtures::now())
         .await
         .expect("login credentials expected to be valid");
     verify::token::valid_for_name(&app, &secret, &name).await;
 }
 
-pub async fn invalid_login(app: &App, name: &Name, password: &Password) {
-    let error = app
-        .logins()
+pub async fn invalid_login<App>(app: &App, name: &Name, password: &Password)
+where
+    Logins: FromRef<App>,
+{
+    let error = Logins::from_ref(app)
         .with_password(name, password, &fixtures::now())
         .await
         .expect_err("login credentials expected not to be valid");