asonix/mastodon
1
1
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Reduce .times usage in StatusPin and add PIN_LIMIT constant in validator (#27945)

Browse source
This commit is contained in:
Matt Jankowski 2023-11-20 04:07:25 -05:00 committed by GitHub
parent 1fabf20a88
commit 00c6ebd86f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/validators/status_pin_validator.rb
View file

@ -1,10 +1,12 @@
# frozen_string_literal: true
class StatusPinValidator < ActiveModel::Validator
PIN_LIMIT = 5
def validate(pin)
pin.errors.add(:base, I18n.t('statuses.pin_errors.reblog')) if pin.status.reblog?
pin.errors.add(:base, I18n.t('statuses.pin_errors.ownership')) if pin.account_id != pin.status.account_id
pin.errors.add(:base, I18n.t('statuses.pin_errors.direct')) if pin.status.direct_visibility?
pin.errors.add(:base, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count > 4 && pin.account.local?
pin.errors.add(:base, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count >= PIN_LIMIT && pin.account.local?
end
end

49
spec/models/status_pin_spec.rb
View file

@ -40,35 +40,34 @@ RSpec.describe StatusPin do
expect(described_class.new(account: account, status: status).save).to be false
end
max_pins = 5
it 'does not allow pins above the max' do
account = Fabricate(:account)
status = []
context 'with a pin limit' do
before { stub_const('StatusPinValidator::PIN_LIMIT', 2) }
(max_pins + 1).times do |i|
status[i] = Fabricate(:status, account: account)
it 'does not allow pins above the max' do
account = Fabricate(:account)
Fabricate.times(StatusPinValidator::PIN_LIMIT, :status_pin, account: account)
pin = described_class.new(account: account, status: Fabricate(:status, account: account))
expect(pin.save)
.to be(false)
expect(pin.errors[:base])
.to contain_exactly(I18n.t('statuses.pin_errors.limit'))
end
max_pins.times do |i|
expect(described_class.new(account: account, status: status[i]).save).to be true
it 'allows pins above the max for remote accounts' do
account = Fabricate(:account, domain: 'remote.test', username: 'bob', url: 'https://remote.test/')
Fabricate.times(StatusPinValidator::PIN_LIMIT, :status_pin, account: account)
pin = described_class.new(account: account, status: Fabricate(:status, account: account))
expect(pin.save)
.to be(true)
expect(pin.errors[:base])
.to be_empty
end
expect(described_class.new(account: account, status: status[max_pins]).save).to be false
end
it 'allows pins above the max for remote accounts' do
account = Fabricate(:account, domain: 'remote.test', username: 'bob', url: 'https://remote.test/')
status = []
(max_pins + 1).times do |i|
status[i] = Fabricate(:status, account: account)
end
max_pins.times do |i|
expect(described_class.new(account: account, status: status[i]).save).to be true
end
expect(described_class.new(account: account, status: status[max_pins]).save).to be true
end
end
end