Refactor price statuses

#522
This commit is contained in:
Artur Beljajev 2017-06-05 01:32:33 +03:00
parent f76e1259fc
commit f3e790b481
2 changed files with 32 additions and 32 deletions

View file

@ -40,10 +40,10 @@ module Billing
end end
def self.statuses def self.statuses
%w[pending effective expired] %w[upcoming effective expired]
end end
def self.pending def self.upcoming
where("#{attribute_alias(:effect_time)} > ?", Time.zone.now) where("#{attribute_alias(:effect_time)} > ?", Time.zone.now)
end end

View file

@ -45,11 +45,11 @@ RSpec.describe Billing::Price do
describe '::statuses', db: false do describe '::statuses', db: false do
it 'returns statuses' do it 'returns statuses' do
expect(described_class.statuses).to eq(%w[pending effective expired]) expect(described_class.statuses).to eq(%w[upcoming effective expired])
end end
end end
describe '::pending' do describe '::upcoming' do
before :example do before :example do
travel_to Time.zone.parse('05.07.2010 00:00') travel_to Time.zone.parse('05.07.2010 00:00')
@ -57,8 +57,8 @@ RSpec.describe Billing::Price do
create(:price, id: 2, effect_time: Time.zone.parse('05.07.2010 00:01')) create(:price, id: 2, effect_time: Time.zone.parse('05.07.2010 00:01'))
end end
it 'returns pending' do it 'returns upcoming' do
expect(described_class.pending.ids).to eq([2]) expect(described_class.upcoming.ids).to eq([2])
end end
end end