Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-09-12 19:17:38 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Compact validation matcher checks where possible (#39435)

Browse Source
This commit is contained in:
Matt Jankowski
2026-07-21 08:43:46 -04:00
committed by GitHub
parent 8ea057d215
commit ac5ced71cd
8 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spec/models/account_spec.rb
View File

@@ -547,10 +547,7 @@ RSpec.describe Account do
it { is_expected.to_not allow_values(account_note_over_limit).for(:note) }
it { is_expected.to validate_absence_of(:followers_url).on(:create) }
it { is_expected.to validate_absence_of(:inbox_url).on(:create) }
it { is_expected.to validate_absence_of(:shared_inbox_url).on(:create) }
it { is_expected.to validate_absence_of(:uri).on(:create) }
it { is_expected.to validate_absence_of(:inbox_url, :followers_url, :shared_inbox_url, :uri).on(:create) }
it { is_expected.to allow_values([], ['example.com'], (1..domains_limit).to_a).for(:attribution_domains) }
it { is_expected.to_not allow_values(['example com'], ['@'], (1..(domains_limit + 1)).to_a).for(:attribution_domains) }

4
spec/models/collection_spec.rb
View File

@@ -29,9 +29,7 @@ RSpec.describe Collection do
it { is_expected.to validate_length_of(:description_html).is_at_most(Collection::DESCRIPTION_LENGTH_HARD_LIMIT) }
it { is_expected.to validate_presence_of(:uri) }
it { is_expected.to validate_presence_of(:original_number_of_items) }
it { is_expected.to validate_presence_of(:original_number_of_items, :uri) }
it { is_expected.to allow_value('randomstuff').for(:language) }
end

3
spec/models/custom_filter_spec.rb
View File

@@ -7,8 +7,7 @@ RSpec.describe CustomFilter do
describe 'Validations' do
it { is_expected.to validate_length_of(:title).is_at_most(described_class::TITLE_LENGTH_LIMIT) }
it { is_expected.to validate_presence_of(:context) }
it { is_expected.to validate_presence_of(:title) }
it { is_expected.to validate_presence_of(:context, :title) }
it { is_expected.to_not allow_values([], %w(invalid)).for(:context) }
it { is_expected.to allow_values(%w(home)).for(:context) }

3
spec/models/instance_moderation_note_spec.rb
View File

@@ -19,7 +19,6 @@ RSpec.describe InstanceModerationNote do
it { is_expected.to allow_value('non-existent.example').for(:domain) }
it { is_expected.to validate_length_of(:content).is_at_most(described_class::CONTENT_SIZE_LIMIT) }
it { is_expected.to validate_presence_of(:content) }
it { is_expected.to validate_presence_of(:domain) }
it { is_expected.to validate_presence_of(:content, :domain) }
end
end

3
spec/models/ip_block_spec.rb
View File

@@ -9,8 +9,7 @@ RSpec.describe IpBlock do
describe 'Validations' do
subject { Fabricate.build :ip_block }
it { is_expected.to validate_presence_of(:ip) }
it { is_expected.to validate_presence_of(:severity) }
it { is_expected.to validate_presence_of(:ip, :severity) }
it { is_expected.to validate_uniqueness_of(:ip) }

3
spec/models/rule_translation_spec.rb
View File

@@ -10,8 +10,7 @@ RSpec.describe RuleTranslation do
describe 'Validations' do
subject { Fabricate.build :rule_translation }
it { is_expected.to validate_presence_of(:language) }
it { is_expected.to validate_presence_of(:text) }
it { is_expected.to validate_presence_of(:language, :text) }
it { is_expected.to validate_length_of(:text).is_at_most(Rule::TEXT_SIZE_LIMIT) }
it { is_expected.to validate_uniqueness_of(:language).scoped_to(:rule_id) }
end

3
spec/models/terms_of_service_spec.rb
View File

@@ -25,8 +25,7 @@ RSpec.describe TermsOfService do
context 'when published' do
subject { Fabricate.build :terms_of_service, published_at: Time.zone.today }
it { is_expected.to validate_presence_of(:changelog) }
it { is_expected.to validate_presence_of(:effective_date) }
it { is_expected.to validate_presence_of(:changelog, :effective_date) }
end
end

5
spec/models/webauthn_credential_spec.rb
View File

@@ -6,10 +6,7 @@ RSpec.describe WebauthnCredential do
describe 'Validations' do
subject { Fabricate.build :webauthn_credential }
it { is_expected.to validate_presence_of(:external_id) }
it { is_expected.to validate_presence_of(:public_key) }
it { is_expected.to validate_presence_of(:nickname) }
it { is_expected.to validate_presence_of(:sign_count) }
it { is_expected.to validate_presence_of(:external_id, :nickname, :public_key, :sign_count) }
it { is_expected.to validate_uniqueness_of(:external_id) }
it { is_expected.to validate_uniqueness_of(:nickname).scoped_to(:user_id) }