Consider nil in price expire time as effective

#522

spec/factories/billing/price.rb

@@ -7,7 +7,7 @@ FactoryGirl.define do
     operation_category Billing::Price.operation_categories.first
     zone
 
-    factory :unexpired_price do
+    factory :effective_price do
       expire_time { Time.zone.now + 1.day }
     end
 

spec/features/admin/billing/prices/edit_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.feature 'Editing price in admin area', settings: false do
-  given!(:price) { create(:unexpired_price) }
+  given!(:price) { create(:effective_price) }
 
   background do
     sign_in_to_admin_area

spec/features/admin/billing/prices/expire_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.feature 'Expiring price in admin area', settings: false do
-  given!(:price) { create(:unexpired_price) }
+  given!(:price) { create(:effective_price) }
 
   background do
     sign_in_to_admin_area

spec/features/admin/billing/prices/list_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.feature 'Viewing prices in admin area', settings: false do
-  given!(:unexpired_price) { create(:unexpired_price) }
+  given!(:effective_price) { create(:effective_price) }
   given!(:expired_price) { create(:expired_price) }
 
   background do
@@ -9,17 +9,17 @@ RSpec.feature 'Viewing prices in admin area', settings: false do
   end
 
   describe 'search' do
-    context 'when validity is not selected' do
-      scenario 'shows unexpired prices' do
+    context 'when status is not selected' do
+      scenario 'shows effective prices' do
         visit admin_prices_path
         expect(page).to have_css('.price', count: 1)
       end
     end
 
-    context 'when validity is given' do
-      scenario 'filters by given validity' do
+    context 'when status is given' do
+      scenario 'filters by given status' do
         visit admin_prices_path
-        select 'unexpired', from: 'search_validity'
+        select 'effective', from: 'search_status'
         submit_search_form
 
         expect(page).to have_css('.price', count: 1)

spec/models/billing/price_spec.rb

@@ -3,6 +3,7 @@ require 'rails_helper'
 RSpec.describe Billing::Price do
   it { is_expected.to monetize(:price) }
   it { is_expected.to be_versioned }
+  it { is_expected.to alias_attribute(:effect_time, :valid_from) }
   it { is_expected.to alias_attribute(:expire_time, :valid_to) }
 
   it 'should have one version' do
@@ -14,34 +15,68 @@ RSpec.describe Billing::Price do
   end
 
   describe '::operation_categories', db: false do
-    it 'returns available operation categories' do
+    it 'returns operation categories' do
       categories = %w[create renew]
       expect(described_class.operation_categories).to eq(categories)
     end
   end
 
   describe '::durations', db: false do
-    it 'returns available durations' do
+    it 'returns durations' do
       durations = [
-        '3 mons',
-        '6 mons',
-        '9 mons',
-        '1 year',
-        '2 years',
-        '3 years',
-        '4 years',
-        '5 years',
-        '6 years',
-        '7 years',
-        '8 years',
-        '9 years',
-        '10 years',
+          '3 mons',
+          '6 mons',
+          '9 mons',
+          '1 year',
+          '2 years',
+          '3 years',
+          '4 years',
+          '5 years',
+          '6 years',
+          '7 years',
+          '8 years',
+          '9 years',
+          '10 years',
       ]
 
       expect(described_class.durations).to eq(durations)
     end
   end
 
+  describe '::statuses', db: false do
+    it 'returns statuses' do
+      expect(described_class.statuses).to eq(%w[pending effective expired])
+    end
+  end
+
+  describe '::pending' do
+    before :example do
+      travel_to Time.zone.parse('05.07.2010 00:00')
+
+      create(:price, id: 1, effect_time: Time.zone.parse('05.07.2010 00:00'))
+      create(:price, id: 2, effect_time: Time.zone.parse('05.07.2010 00:01'))
+    end
+
+    it 'returns pending' do
+      expect(described_class.pending.ids).to eq([2])
+    end
+  end
+
+  describe '::effective' do
+    before :example do
+      travel_to Time.zone.parse('05.07.2010 00:00')
+
+      create(:price, id: 1, effect_time: '05.07.2010 00:01', expire_time: '05.07.2010 00:02')
+      create(:price, id: 2, effect_time: '05.07.2010 00:00', expire_time: '05.07.2010 00:01')
+      create(:price, id: 3, effect_time: '05.07.2010 00:00', expire_time: nil)
+      create(:price, id: 4, effect_time: '04.07.2010', expire_time: '04.07.2010 23:59')
+    end
+
+    it 'returns effective' do
+      expect(described_class.effective.ids).to eq([2, 3])
+    end
+  end
+
   describe 'zone validation', db: false do
     subject(:price) { described_class.new }
 

spec/models/concerns/billing/price/expirable_spec.rb

@@ -1,20 +1,6 @@
 require 'rails_helper'
 
 RSpec.describe Billing::Price do
-  describe '::unexpired' do
-    before :example do
-      travel_to Time.zone.parse('05.07.2010 00:00')
-
-      create(:price, id: 1, expire_time: Time.zone.parse('04.07.2010 23:59'))
-      create(:price, id: 2, expire_time: Time.zone.parse('05.07.2010 00:00'))
-      create(:price, id: 3, expire_time: Time.zone.parse('05.07.2010 00:01'))
-    end
-
-    it 'returns prices with expire time in the future ' do
-      expect(described_class.unexpired.ids).to eq([2, 3])
-    end
-  end
-
   describe '::expired' do
     before :example do
       travel_to Time.zone.parse('05.07.2010 00:00')

spec/requests/admin/billing/prices/expire_spec.rb

@@ -6,14 +6,14 @@ RSpec.describe 'admin price expire', settings: false do
   end
 
   it 'expires price' do
-    price = create(:unexpired_price)
+    price = create(:effective_price)
 
     expect { patch expire_admin_price_path(price); price.reload }
         .to change { price.expired? }.from(false).to(true)
   end
 
   it 'redirects to :index' do
-    price = create(:unexpired_price)
+    price = create(:effective_price)
 
     patch expire_admin_price_path(price)