fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-22 09:08:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove un-needed Poll.attached scope (#33368)

Browse source
This commit is contained in:
Matt Jankowski 2024-12-20 10:15:11 -05:00 committed by GitHub
parent b648c64e2e
commit f35de1ed0d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/polls/votes_controller.rb
View file

@ -15,7 +15,7 @@ class Api::V1::Polls::VotesController < Api::BaseController
private private
def set_poll def set_poll
@poll = Poll.attached.find(params[:poll_id]) @poll = Poll.find(params[:poll_id])
authorize @poll.status, :show? authorize @poll.status, :show?
rescue Mastodon::NotPermittedError rescue Mastodon::NotPermittedError
not_found not_found

2
app/controllers/api/v1/polls_controller.rb
View file

@ -15,7 +15,7 @@ class Api::V1::PollsController < Api::BaseController
private private
def set_poll def set_poll
@poll = Poll.attached.find(params[:id]) @poll = Poll.find(params[:id])
authorize @poll.status, :show? authorize @poll.status, :show?
rescue Mastodon::NotPermittedError rescue Mastodon::NotPermittedError
not_found not_found

2
app/models/poll.rb
View file

@ -39,8 +39,6 @@ class Poll < ApplicationRecord
validates :expires_at, presence: true, if: :local? validates :expires_at, presence: true, if: :local?
validates_with PollValidator, on: :create, if: :local? validates_with PollValidator, on: :create, if: :local?
scope :attached, -> { where.not(status_id: nil) }
before_validation :prepare_options, if: :local? before_validation :prepare_options, if: :local?
before_validation :prepare_votes_count before_validation :prepare_votes_count
before_validation :prepare_cached_tallies before_validation :prepare_cached_tallies

19
spec/models/poll_spec.rb
View file

@ -5,25 +5,6 @@ require 'rails_helper'
RSpec.describe Poll do RSpec.describe Poll do
include_examples 'Expireable' include_examples 'Expireable'
describe 'Scopes' do
let(:status) { Fabricate(:status) }
let(:attached_poll) { Fabricate(:poll, status: status) }
let(:not_attached_poll) do
Fabricate(:poll).tap do |poll|
poll.status = nil
poll.save(validate: false)
end
end
describe '.attached' do
it 'finds the correct records' do
results = described_class.attached
expect(results).to eq([attached_poll])
end
end
end
describe '#reset_votes!' do describe '#reset_votes!' do
let(:poll) { Fabricate :poll, cached_tallies: [2, 3], votes_count: 5, voters_count: 5 } let(:poll) { Fabricate :poll, cached_tallies: [2, 3], votes_count: 5, voters_count: 5 }
let!(:vote) { Fabricate :poll_vote, poll: } let!(:vote) { Fabricate :poll_vote, poll: }