rspec-puppet 2.6.12 → 2.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b38203076b16e77839a929ceecfc693389fa5c
-  data.tar.gz: ea68533700285fe1fc3177e96f1552007b1e098b
+  metadata.gz: 5020bbb4c2617605ec685fff03b6758f52e39618
+  data.tar.gz: 120375f102a07f4e70137d4775db43081aeb83bf
 SHA512:
-  metadata.gz: 20dfed8bed477dce75a21d4ba98c41f50e9ba779d44c3c8838eb77b95da69e6430cf56cf57766afc0a253ed0880d4c726e59b4e09d4db08005aa0c49a4efacb7
-  data.tar.gz: cbb9f00b6e90493b5934e5cb3acb3cb43ac8ed92e4d9c04e11012aea829beed0b19eedbd8795015d15cb51158016717d35f55a6a07aeb4e2dd9422e1e26810a8
+  metadata.gz: 3ce834172e14e490eabc25dfaf0b3a0232d273eb7cbb6138231731a42939bd63e5662968044b3e553511603b3d0645f75c4c2013ddb30503529792a9a0a70fe9
+  data.tar.gz: 2e0abd0830f9c3faed1028c618b94334c7ac73ae2b88543f2db4ba38abb2698566eda4fb3b697508a88d2e7279c25002fae8765c7b37dc966adaad7d98c4d444

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.6.13]
+
+### Fixed
+
+ * rspec-puppet no longer attempts to set the `trusted_server_facts` Puppet
+   setting on Puppet 4.0.0, as the setting was only introduced in Puppet 4.1.0.
+ * Automatic `Selinux` stubbing introduced in 2.6.12 no longer assumes the use
+   of rspec-mocks. If rspec-mocks is not available, it will fall back to mocha
+   and finally fall back to doing nothing if neither is available.
+
 ## [2.6.12]
 
 ### Fixed

data/lib/rspec-puppet.rb

@@ -120,7 +120,14 @@ RSpec.configure do |c|
     if RSpec::Puppet.rspec_puppet_example?
       Puppet::Util::Platform.pretend_to_be RSpec.configuration.platform
       stub_file_consts(example) if self.respond_to?(:stub_file_consts)
-      allow(Selinux).to receive(:is_selinux_enabled).and_return(0) if defined?(Selinux)
+
+      if defined?(Selinux)
+        if respond_to?(:allow)
+          allow(Selinux).to receive(:is_selinux_enabled).and_return(0)
+        elsif Selinux.respond_to?(:stubs)
+          Selinux.stubs(:is_selinux_enabled).returns(0)
+        end
+      end
     end
   end
 

data/lib/rspec-puppet/adapters.rb

@@ -107,7 +107,7 @@ module RSpec::Puppet
       end
     end
 
-    class Adapter4X < Base
+    class Adapter40 < Base
       def setup_puppet(example_group)
         super
 
@@ -151,7 +151,6 @@ module RSpec::Puppet
           [:hiera_config, :hiera_config],
           [:strict_variables, :strict_variables],
           [:manifest, :manifest],
-          [:trusted_server_facts, :trusted_server_facts]
         ])
       end
 
@@ -185,6 +184,14 @@ module RSpec::Puppet
       end
     end
 
+    class Adapter4X < Adapter40
+      def settings_map
+        super.concat([
+          [:trusted_server_facts, :trusted_server_facts]
+        ])
+      end
+    end
+
     class Adapter30 < Base
       def settings_map
         super.concat([
@@ -241,7 +248,8 @@ module RSpec::Puppet
 
     def self.get
       [
-        ['4.0', Adapter4X],
+        ['4.1', Adapter4X],
+        ['4.0', Adapter40],
         ['3.5', Adapter35],
         ['3.4', Adapter34],
         ['3.3', Adapter33],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.6.12
+  version: 2.6.13
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec