IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Fix failing spec.

Browse Source
This commit is contained in:
Guo Xiang Tan 2019-04-23 18:25:21 +08:00
parent 97dcd50e51
commit d07605d885
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user_badge.rb
View File

@ -27,7 +27,7 @@ class UserBadge < ActiveRecord::Base
private private
def single_grant_badge? def single_grant_badge?
self.badge.single_grant? self.badge ? self.badge.single_grant? : true
end end
end end

4
spec/jobs/auto_expire_user_api_keys_spec.rb
View File

@ -7,7 +7,7 @@ RSpec.describe Jobs::AutoExpireUserApiKeys do
context 'when user api key is unused in last 1 days' do context 'when user api key is unused in last 1 days' do
before do before do
SiteSetting.expire_user_api_keys_days = true SiteSetting.expire_user_api_keys_days = 1
end end
it 'should revoke the key' do it 'should revoke the key' do
@ -17,7 +17,7 @@ RSpec.describe Jobs::AutoExpireUserApiKeys do
described_class.new.execute({}) described_class.new.execute({})
expect(key1.reload.revoked_at).to eq(Time.zone.now) expect(key1.reload.revoked_at).to be_within(1.second).of(Time.zone.now)
expect(key2.reload.revoked_at).to eq(nil) expect(key2.reload.revoked_at).to eq(nil)
end end
end end

4
spec/models/user_badge_spec.rb
View File

@ -4,7 +4,9 @@ require_dependency 'user_badge'
describe UserBadge do describe UserBadge do
context 'validations' do context 'validations' do
before(:each) { BadgeGranter.grant(Fabricate(:badge), Fabricate(:user)) } let(:badge) { Fabricate(:badge) }
let(:user) { Fabricate(:user) }
let(:subject) { BadgeGranter.grant(badge, user) }
it { is_expected.to validate_presence_of(:badge_id) } it { is_expected.to validate_presence_of(:badge_id) }
it { is_expected.to validate_presence_of(:user_id) } it { is_expected.to validate_presence_of(:user_id) }