2 files changed, 17 insertions, 10 deletions
diff --git a/src/push/handlers/ping/mod.rs b/src/push/handlers/ping/mod.rs
index db828fa..2a86984 100644
--- a/src/push/handlers/ping/mod.rs
+++ b/src/push/handlers/ping/mod.rs
@@ -1,7 +1,10 @@
 use axum::{Json, extract::State, http::StatusCode};
-use web_push::WebPushClient;
 
-use crate::{error::Internal, push::app::Push, token::extract::Identity};
+use crate::{
+    error::Internal,
+    push::{Publish, app::Push},
+    token::extract::Identity,
+};
 
 #[cfg(test)]
 mod test;
@@ -15,7 +18,7 @@ pub async fn handler<P>(
     Json(_): Json<Request>,
 ) -> Result<StatusCode, Internal>
 where
-    P: WebPushClient,
+    P: Publish,
 {
     push.ping(&identity.login).await?;
 
diff --git a/src/push/handlers/ping/test.rs b/src/push/handlers/ping/test.rs
index 5725131..3481139 100644
--- a/src/push/handlers/ping/test.rs
+++ b/src/push/handlers/ping/test.rs
@@ -2,8 +2,9 @@ use axum::{
     extract::{Json, State},
     http::StatusCode,
 };
+use itertools::Itertools;
 
-use crate::test::fixtures;
+use crate::{event::Heartbeat, test::fixtures};
 
 #[tokio::test]
 async fn ping_without_subscriptions() {
@@ -11,18 +12,21 @@ async fn ping_without_subscriptions() {
 
     let recipient = fixtures::identity::create(&app, &fixtures::now()).await;
 
-    app.vapid()
-        .refresh_key(&fixtures::now())
-        .await
-        .expect("refreshing the VAPID key always succeeds");
-
     let response = super::handler(State(app.push()), recipient, Json(super::Request {}))
         .await
         .expect("sending a ping with no subscriptions always succeeds");
 
     assert_eq!(StatusCode::ACCEPTED, response);
 
-    assert!(app.webpush().sent().is_empty());
+    assert!(
+        app.publisher()
+            .sent()
+            .into_iter()
+            .filter(|publish| publish.message_eq(&Heartbeat::Heartbeat)
+                && publish.subscriptions.is_empty())
+            .exactly_one()
+            .is_ok()
+    );
 }
 
 // More complete testing requires that we figure out how to generate working p256 ECDH keys for