Merge branch 'master' into registry-475

# Conflicts:
#	app/models/billing/price.rb
#	spec/models/billing/price_spec.rb
This commit is contained in:
Artur Beljajev 2017-06-15 09:39:14 +03:00
commit dfdce5dedc
29 changed files with 313 additions and 132 deletions

View file

@ -6,5 +6,13 @@ FactoryGirl.define do
duration '1 year'
operation_category Billing::Price.operation_categories.first
zone
factory :effective_price do
expire_time { Time.zone.now + 1.day }
end
factory :expired_price do
expire_time { Time.zone.now - 1.day }
end
end
end