diff --git a/lib/linux_admin/registration_system.rb b/lib/linux_admin/registration_system.rb index 01f76d6..bfc3572 100644 --- a/lib/linux_admin/registration_system.rb +++ b/lib/linux_admin/registration_system.rb @@ -22,10 +22,10 @@ def registered? private def self.registration_type_uncached - if SubscriptionManager.new.registered? - SubscriptionManager - elsif Rhn.new.registered? + if Rhn.new.registered? Rhn + elsif SubscriptionManager.new.registered? + SubscriptionManager else self end diff --git a/spec/registration_system_spec.rb b/spec/registration_system_spec.rb index 214acf1..f14ada5 100644 --- a/spec/registration_system_spec.rb +++ b/spec/registration_system_spec.rb @@ -8,7 +8,7 @@ end it "when registered RHN" do - stub_registered_to_system(:rhn) + stub_registered_to_system(:sm, :rhn) expect(described_class.registration_type).to eq(LinuxAdmin::Rhn) end @@ -53,8 +53,8 @@ end end - def stub_registered_to_system(system) - LinuxAdmin::SubscriptionManager.any_instance.stub(:registered? => (system == :sm)) - LinuxAdmin::Rhn.any_instance.stub(:registered? => data_file_path("rhn/systemid")) if system == :rhn + def stub_registered_to_system(*system) + LinuxAdmin::SubscriptionManager.any_instance.stub(:registered? => (system.include?(:sm))) + LinuxAdmin::Rhn.any_instance.stub(:registered? => (system.include?(:rhn))) end end \ No newline at end of file