bgme/mastodon
1
0
Fork 0
mirror of https://github.com/yingziwu/mastodon.git synced 2026-02-04 03:25:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge commit from fork

Browse source
This commit is contained in:
Claire 2026-01-20 15:10:38 +01:00 • committed by GitHub
parent 6698901d57
commit 1b3ef035b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/web/push_subscriptions_controller.rb
View file

@ -62,7 +62,7 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController
end end
def set_push_subscription def set_push_subscription
@push_subscription = ::Web::PushSubscription.find(params[:id]) @push_subscription = ::Web::PushSubscription.where(user_id: active_session.user_id).find(params[:id])
end end
def subscription_params def subscription_params

5
spec/requests/api/web/push_subscriptions_spec.rb
View file

@ -163,9 +163,10 @@ RSpec.describe 'API Web Push Subscriptions' do
end end
describe 'PUT /api/web/push_subscriptions/:id' do describe 'PUT /api/web/push_subscriptions/:id' do
before { sign_in Fabricate :user } before { sign_in user }
let(:subscription) { Fabricate :web_push_subscription } let(:user) { Fabricate(:user) }
let(:subscription) { Fabricate(:web_push_subscription, user: user) }
it 'gracefully handles invalid nested params' do it 'gracefully handles invalid nested params' do
put api_web_push_subscription_path(subscription), params: { data: 'invalid' } put api_web_push_subscription_path(subscription), params: { data: 'invalid' }