gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-06 18:01:05 +00:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Fix intermittent failure of TOS model spec from effective date collision (#35244)

Browse Source
This commit is contained in:
Matt Jankowski 2025-07-03 12:28:47 -04:00 committed by GitHub
parent 2af17adc34
commit e8d2432e6a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spec/models/terms_of_service_spec.rb
View File

@ -44,22 +44,24 @@ RSpec.describe TermsOfService do
end end
describe '.live' do describe '.live' do
let!(:not_effective) { Fabricate :terms_of_service } # The `pre_effective_date` record captures a period before the value was tracked
# The update in the `before` block creates an invalid (but historically plausible) record
let!(:pre_effective_date) { travel_to(10.days.ago) { Fabricate :terms_of_service, effective_date: Time.zone.today } }
let!(:effective_past) { travel_to(3.days.ago) { Fabricate :terms_of_service, effective_date: Time.zone.today } } let!(:effective_past) { travel_to(3.days.ago) { Fabricate :terms_of_service, effective_date: Time.zone.today } }
let!(:effective_future) { Fabricate :terms_of_service, effective_date: 3.days.from_now } let!(:effective_future) { Fabricate :terms_of_service, effective_date: 3.days.from_now }
before { not_effective.update_attribute(:effective_date, nil) } before { pre_effective_date.update_attribute(:effective_date, nil) }
it 'returns records without effective or with past effective' do it 'returns records without effective or with past effective' do
expect(described_class.live) expect(described_class.live)
.to include(not_effective) .to include(pre_effective_date)
.and include(effective_past) .and include(effective_past)
.and not_include(effective_future) .and not_include(effective_future)
end end
end end
describe '.upcoming' do describe '.upcoming' do
let!(:unpublished) { Fabricate :terms_of_service, published_at: nil } let!(:unpublished) { Fabricate :terms_of_service, published_at: nil, effective_date: 10.days.from_now }
let!(:effective_past) { travel_to(3.days.ago) { Fabricate :terms_of_service, effective_date: Time.zone.today } } let!(:effective_past) { travel_to(3.days.ago) { Fabricate :terms_of_service, effective_date: Time.zone.today } }
let!(:effective_future_near) { Fabricate :terms_of_service, effective_date: 3.days.from_now } let!(:effective_future_near) { Fabricate :terms_of_service, effective_date: 3.days.from_now }
let!(:effective_future_far) { Fabricate :terms_of_service, effective_date: 5.days.from_now } let!(:effective_future_far) { Fabricate :terms_of_service, effective_date: 5.days.from_now }