foreman_expire_hosts 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf158e1beab470ea6dc171ed30d7e11b7194dcd4
-  data.tar.gz: 026d9ba320a50dc94c2cb336e869ce5b22a1b912
+  metadata.gz: b51017605d1e78a328d639736c4fba5367f872ba
+  data.tar.gz: 00aaff59e5242156824203423ece81d2f213f415
 SHA512:
-  metadata.gz: 777d04912617e0a33c2dc932e3456b73a7b7fbf9d3a4ffee980f5bcba33b1cca574f4a18c7c5c8a74dd9d50cd5aa345bea75403f3043f56940cf7b06f06dff3e
-  data.tar.gz: d99b1ac558856087474aa314e433ed54ca584b2411d12ad3c0697465febdc6defd9743ab35a79cb913312b89c1c0bb7f9d5a2d66709b708e5f1dd33d09c51c8c
+  metadata.gz: a56ee4a45d47db3650f9e311a54c055fb200a84a7d6640f20532a8920660a42f39c47e702869174bf30a6462877a5583e6f5bdb5377e7f6637b51713afc20854
+  data.tar.gz: 50bea00b635d7fa753a43b81e1f6b8402d3f331fbaca61c7eb57c6add02e6f2287f143ccb7b50d61c1e74cd4d6055746f9c9eaa144fd1fe290618da7652a893a

data/app/models/concerns/foreman_expire_hosts/host_ext.rb

@@ -62,14 +62,10 @@ module ForemanExpireHosts
       expiration_grace_period_end_date <= Date.today
     end
 
-    def pending_expiration_start_date
-      Date.today - Setting['notify1_days_before_host_expiry'].to_i
-    end
-
     def pending_expiration?
       return false unless expires?
       return false if expired?
-      pending_expiration_start_date <= expired_on
+      expired_on - Setting['notify1_days_before_host_expiry'].to_i <= Date.today
     end
 
     def can_modify_expiry_date?

data/lib/foreman_expire_hosts/version.rb

@@ -1,3 +1,3 @@
 module ForemanExpireHosts
-  VERSION = '2.1.1'.freeze
+  VERSION = '2.1.2'.freeze
 end

data/test/factories/foreman_expire_hosts_factories.rb

@@ -5,6 +5,10 @@ FactoryGirl.modify do
       to_create { |instance| instance.save(validate: false) }
     end
 
+    trait :expires_in_a_year do
+      expired_on Date.today + 365
+    end
+
     trait :expires_in_a_week do
       expired_on Date.today + 7
     end

data/test/functional/concerns/hosts_controller_extensions_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 
 class HostsControllerTest < ActionController::TestCase
   setup do
-    User.current = FactoryGirl.build(:user, :admin)
+    User.current = users(:admin)
     disable_orchestration
     setup_settings
   end

data/test/unit/concerns/host_extensions_test.rb

@@ -157,6 +157,37 @@ class ForemanExpireHostsHostExtTest < ActiveSupport::TestCase
     end
   end
 
+  context 'a host expiring in a year' do
+    setup do
+      @host = FactoryGirl.build(:host, :expires_in_a_year)
+    end
+
+    test 'should expire' do
+      assert_equal (Date.today + 365), @host.expired_on
+      assert @host.expires?
+    end
+
+    test 'should not expire today' do
+      refute @host.expires_today?
+    end
+
+    test 'should not be expired' do
+      refute @host.expired?
+    end
+
+    test 'should not be expired past grace period' do
+      refute @host.expired_past_grace_period?
+    end
+
+    test 'should not be pending expiration' do
+      refute @host.pending_expiration?
+    end
+
+    test 'should only exist in correct scopes' do
+      exists_only_in_scopes(@host, ['expiring'])
+    end
+  end
+
   context 'a host in grace period' do
     setup do
       @host = FactoryGirl.build(:host, :expired_grace)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface