From 877e6999dc65d90a3429e68b14d1b87597b44a8d Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Tue, 8 Nov 2016 10:07:41 +0200
Subject: [PATCH] Consider domains having current time at "expire_time"
 attribute expired

Fixes #238
---
 app/models/concerns/domain/expirable.rb       | 4 ++--
 spec/models/concerns/domain/expirable_spec.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/concerns/domain/expirable.rb b/app/models/concerns/domain/expirable.rb
index abfeed400..be1928826 100644
--- a/app/models/concerns/domain/expirable.rb
+++ b/app/models/concerns/domain/expirable.rb
@@ -7,7 +7,7 @@ module Concerns::Domain::Expirable
 
   class_methods do
     def expired
-      where("#{attribute_alias(:expire_time)} < ?", Time.zone.now)
+      where("#{attribute_alias(:expire_time)} <= ?", Time.zone.now)
     end
   end
 
@@ -16,7 +16,7 @@ module Concerns::Domain::Expirable
   end
 
   def expired?
-    expire_time.past?
+    expire_time <= Time.zone.now
   end
 
   def expirable?
diff --git a/spec/models/concerns/domain/expirable_spec.rb b/spec/models/concerns/domain/expirable_spec.rb
index 4f29354f6..2a2c9b9cf 100644
--- a/spec/models/concerns/domain/expirable_spec.rb
+++ b/spec/models/concerns/domain/expirable_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe Domain, db: false do
     end
 
     it 'returns expired domains' do
-      expect(described_class.expired.ids).to eq([1])
+      expect(described_class.expired.ids).to eq([1, 2])
     end
   end
 
@@ -53,7 +53,7 @@ RSpec.describe Domain, db: false do
     context 'when :expire_time is now' do
       let(:domain) { described_class.new(expire_time: Time.zone.parse('05.07.2010 00:00')) }
 
-      specify { expect(domain).to_not be_expired }
+      specify { expect(domain).to be_expired }
     end
 
     context 'when :expire_time is in the future' do