Merge remote-tracking branch 'parent/main' into kbtopic-remove-quote

spec/fabricators/web_push_subscription_fabricator.rb

@@ -8,4 +8,6 @@ Fabricator(:web_push_subscription, from: Web::PushSubscription) do
     Base64.urlsafe_encode64(ecdh_key)
   end
   key_auth { Base64.urlsafe_encode64(Random.new.bytes(16)) }
+  user { Fabricate(:user) }
+  access_token { |attrs| Fabricate.build(:accessible_access_token, resource_owner_id: attrs[:user].id) }
 end

spec/requests/api/v1/push/subscriptions_spec.rb

@@ -207,7 +207,8 @@ RSpec.describe 'API V1 Push Subscriptions' do
     Fabricate(
       :web_push_subscription,
       endpoint: create_payload[:subscription][:endpoint],
-      access_token_id: token.id
+      access_token: token,
+      user: user
     )
   end
 end