summaryrefslogtreecommitdiff
path: root/spec/unit
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-10-25 15:32:34 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-10-25 15:36:54 -0700
commit97f836f41b7f8b0aec6733c82873d32140c07304 (patch)
tree7e53b3864b4941d1791270c9d2d87abdc0f4ea7b /spec/unit
parent88af331b0e9b0e8c8a3c1e74e4c5598dc7b8e1c8 (diff)
(maint) Fix spec failures resulting from Facter API changes
Without this patch stdlib tests fail against Facter 2.x and master but not 1.6.x. This patch fixes the problem by initializing the example group differently depending on the version of Facter integrating into the system. The adjusted methods are: 1.x - Facter.collection.loader.load 2.x - Facter.collection.load The collection actually implements the load method in both version, it's simply marked as private in 1.x.
Diffstat (limited to 'spec/unit')
-rw-r--r--spec/unit/facter/pe_version_spec.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/spec/unit/facter/pe_version_spec.rb b/spec/unit/facter/pe_version_spec.rb
index 202a0e5..931c6d4 100644
--- a/spec/unit/facter/pe_version_spec.rb
+++ b/spec/unit/facter/pe_version_spec.rb
@@ -4,7 +4,15 @@ require 'spec_helper'
describe "PE Version specs" do
before :each do
- Facter.collection.loader.load(:pe_version)
+ # Explicitly load the pe_version.rb file which contains generated facts
+ # that cannot be automatically loaded. Puppet 2.x implements
+ # Facter.collection.load while Facter 1.x markes Facter.collection.load as
+ # a private method.
+ if Facter.collection.respond_to? :load
+ Facter.collection.load(:pe_version)
+ else
+ Facter.collection.loader.load(:pe_version)
+ end
end
context "If PE is installed" do