Fix test syntax issues

app/models/mixins/retirement_mixin.rb

@@ -6,7 +6,7 @@ module RetirementMixin
  ERROR_RETIRING = 'error'
 
  included do
- scope :not_scheduled_for_retirement, -> { where(arel_table[:retires_on].not_eq(nil).or(arel_table[:retired].not_eq(true))) }
+ scope :scheduled_to_retire, -> { where(arel_table[:retires_on].not_eq(nil).or(arel_table[:retired].not_eq(true))) }
  end
 
  module ClassMethods

app/models/retirement_manager.rb

@@ -7,8 +7,9 @@ def self.check
  end
  end
 
- private_class_method def self.not_retired_with_ems(model, ems_ids)
- return model.not_scheduled_for_retirement unless model.column_names.include?('ems_id') # Service not assigned to ems_ids
- model.not_scheduled_for_retirement.where(:ems_id => ems_ids)
+ def self.not_retired_with_ems(model, ems_ids)
+ return model.scheduled_to_retire unless model.column_names.include?('ems_id') # Service not assigned to ems_ids
+ model.scheduled_to_retire.where(:ems_id => ems_ids)
  end
+ private_class_method :not_retired_with_ems
 end

spec/models/retirement_manager_spec.rb

@@ -1,19 +1,19 @@
 describe RetirementManager do
  describe "#check" do
  it "with retirement date, runs retirement checks" do
- _, _server, zone = EvmSpecHelper.local_guid_miq_server_zone
+ _, _, zone = EvmSpecHelper.local_guid_miq_server_zone
  ems = FactoryGirl.create(:ems_network, :zone => zone)
 
  load_balancer = FactoryGirl.create(:load_balancer, :retires_on => Time.zone.today + 1.day, :ext_management_system => ems)
  FactoryGirl.create(:load_balancer, :retired => true)
- orch_stack = FactoryGirl.create(:orchestration_stack, :retires_on => Time.zone.today + 1.day, :ext_management_system => ems)
+ orchestration_stack = FactoryGirl.create(:orchestration_stack, :retires_on => Time.zone.today + 1.day, :ext_management_system => ems)
  FactoryGirl.create(:orchestration_stack, :retired => true)
  vm = FactoryGirl.create(:vm, :retires_on => Time.zone.today + 1.day, :ems_id => ems.id)
  FactoryGirl.create(:vm, :retired => true)
  service = FactoryGirl.create(:service, :retires_on => Time.zone.today + 1.day)
  FactoryGirl.create(:service, :retired => true)
 
- expect(RetirementManager.check).to match_array([load_balancer, orch_stack, vm, service])
+ expect(RetirementManager.check).to match_array([load_balancer, orchestration_stack, vm, service])
  end
  end
 end