Merge branch '3.0.x' into 3.1.x

* 3.0.x:
  Revert "Merge branch '2.5.x' into 3.0.x"

1 files changed, 0 insertions, 68 deletions

diff --git a/spec/unit/facter/pe_version_spec.rb b/spec/unit/facter/pe_version_spec.rb
deleted file mode 100644
index 202a0e5..0000000
--- a/spec/unit/facter/pe_version_spec.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-
-describe "PE Version specs" do
-  before :each do
-    Facter.collection.loader.load(:pe_version)
-  end
-
-  context "If PE is installed" do
-    %w{ 2.6.1 2.10.300 }.each do |version|
-      puppetversion = "2.7.19 (Puppet Enterprise #{version})"
-      context "puppetversion => #{puppetversion}" do
-        before :each do
-          Facter.fact(:puppetversion).stubs(:value).returns(puppetversion)
-        end
-
-        (major,minor,patch) = version.split(".")
-
-        it "Should return true" do
-          Facter.fact(:is_pe).value.should == true
-        end
-
-        it "Should have a version of #{version}" do
-          Facter.fact(:pe_version).value.should == version
-        end
-
-        it "Should have a major version of #{major}" do
-          Facter.fact(:pe_major_version).value.should == major
-        end
-
-        it "Should have a minor version of #{minor}" do
-          Facter.fact(:pe_minor_version).value.should == minor
-        end
-
-        it "Should have a patch version of #{patch}" do
-          Facter.fact(:pe_patch_version).value.should == patch
-        end
-      end
-    end
-  end
-
-  context "When PE is not installed" do
-    before :each do
-      Facter.fact(:puppetversion).stubs(:value).returns("2.7.19")
-    end
-
-    it "is_pe is false" do
-      Facter.fact(:is_pe).value.should == false
-    end
-
-    it "pe_version is nil" do
-      Facter.fact(:pe_version).value.should be_nil
-    end
-
-    it "pe_major_version is nil" do
-      Facter.fact(:pe_major_version).value.should be_nil
-    end
-
-    it "pe_minor_version is nil" do
-      Facter.fact(:pe_minor_version).value.should be_nil
-    end
-
-    it "Should have a patch version" do
-      Facter.fact(:pe_patch_version).value.should be_nil
-    end
-  end
-end