puppetlabs_spec_helper 2.6.2 → 4.0.1

data/lib/puppetlabs_spec_helper/puppetlabs_spec/matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stringio'
 require 'rspec/expectations'
 
@@ -6,18 +8,17 @@ require 'rspec/expectations'
 module RSpec
   module Matchers
     module BlockAliases
-      if method_defined? :should
-        alias_method :to, :should unless method_defined? :to
+      if method_defined?(:should) && !method_defined?(:to)
+        alias to should
       end
       if method_defined? :should_not
-        alias_method :to_not, :should_not unless method_defined? :to_not
-        alias_method :not_to, :should_not unless method_defined? :not_to
+        alias to_not should_not unless method_defined? :to_not
+        alias not_to should_not unless method_defined? :not_to
       end
     end
   end
 end
 
-
 ########################################################################
 # Custom matchers...
 RSpec::Matchers.define :have_matching_element do |expected|
@@ -26,7 +27,6 @@ RSpec::Matchers.define :have_matching_element do |expected|
   end
 end
 
-
 RSpec::Matchers.define :exit_with do |expected|
   actual = nil
   match do |block|
@@ -35,13 +35,13 @@ RSpec::Matchers.define :exit_with do |expected|
     rescue SystemExit => e
       actual = e.status
     end
-    actual and actual == expected
+    actual && actual == expected
   end
-  failure_message_for_should do |block|
+  failure_message_for_should do |_block|
     "expected exit with code #{expected} but " +
-      (actual.nil? ? " exit was not called" : "we exited with #{actual} instead")
+      (actual.nil? ? ' exit was not called' : "we exited with #{actual} instead")
   end
-  failure_message_for_should_not do |block|
+  failure_message_for_should_not do |_block|
     "expected that exit would not be called with #{expected}"
   end
   description do
@@ -49,7 +49,6 @@ RSpec::Matchers.define :exit_with do |expected|
   end
 end
 
-
 RSpec::Matchers.define :have_printed do |expected|
   match do |block|
     $stderr = $stdout = StringIO.new
@@ -64,7 +63,7 @@ RSpec::Matchers.define :have_printed do |expected|
       $stderr = STDERR
     end
 
-    if @actual then
+    if @actual
       case expected
       when String
         @actual.include? expected
@@ -77,7 +76,7 @@ RSpec::Matchers.define :have_printed do |expected|
   end
 
   failure_message_for_should do |actual|
-    if actual.nil? then
+    if actual.nil?
       "expected #{expected.inspect}, but nothing was printed"
     else
       "expected #{expected.inspect} to be printed; got:\n#{actual}"

data/lib/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Initialize puppet for testing by loading the
 # 'puppetlabs_spec_helper/puppet_spec_helper' library
 require 'puppetlabs_spec_helper/puppet_spec_helper'
@@ -8,9 +10,9 @@ module PuppetlabsSpec
     # instance suitable for placing in a test harness with the intent of
     # testing parser functions from modules.
     def scope(parts = {})
-      RSpec.deprecate('scope', :replacement => 'rspec-puppet 2.2.0 provides a scope property')
+      RSpec.deprecate('scope', replacement: 'rspec-puppet 2.2.0 provides a scope property')
 
-      if Puppet.version =~ /^2\.[67]/
+      if %r{^2\.[67]}.match?(Puppet.version)
         # loadall should only be necessary prior to 3.x
         # Please note, loadall needs to happen first when creating a scope, otherwise
         # you might receive undefined method `function_*' errors
@@ -19,15 +21,15 @@ module PuppetlabsSpec
 
       scope_compiler = parts[:compiler] || compiler
       scope_parent = parts[:parent] || scope_compiler.topscope
-      scope_resource = parts[:resource] || resource(:type => :node, :title => scope_compiler.node.name)
+      scope_resource = parts[:resource] || resource(type: :node, title: scope_compiler.node.name)
 
-      if Puppet.version =~ /^2\.[67]/
-        scope = Puppet::Parser::Scope.new(:compiler => scope_compiler)
-      else
-        scope = Puppet::Parser::Scope.new(scope_compiler)
-      end
+      scope = if %r{^2\.[67]}.match?(Puppet.version)
+                Puppet::Parser::Scope.new(compiler: scope_compiler)
+              else
+                Puppet::Parser::Scope.new(scope_compiler)
+              end
 
-      scope.source = Puppet::Resource::Type.new(:node, "foo")
+      scope.source = Puppet::Resource::Type.new(:node, 'foo')
       scope.parent = scope_parent
       scope
     end
@@ -35,13 +37,13 @@ module PuppetlabsSpec
 
     def resource(parts = {})
       resource_type = parts[:type] || :hostclass
-      resource_name = parts[:name] || "testing"
+      resource_name = parts[:name] || 'testing'
       Puppet::Resource::Type.new(resource_type, resource_name)
     end
     module_function :resource
 
     def compiler(parts = {})
-      compiler_node = parts[:node] || node()
+      compiler_node = parts[:node] || node
       Puppet::Parser::Compiler.new(compiler_node)
     end
     module_function :compiler
@@ -49,12 +51,12 @@ module PuppetlabsSpec
     def node(parts = {})
       node_name = parts[:name] || 'testinghost'
       options = parts[:options] || {}
-      if Puppet.version.to_f >= 4.0
-        node_environment = Puppet::Node::Environment.create(parts[:environment] || 'test', [])
-      else
-        node_environment = Puppet::Node::Environment.new(parts[:environment] || 'test')
-      end
-      options.merge!({:environment => node_environment})
+      node_environment = if Puppet.version.to_f >= 4.0
+                           Puppet::Node::Environment.create(parts[:environment] || 'test', [])
+                         else
+                           Puppet::Node::Environment.new(parts[:environment] || 'test')
+                         end
+      options[:environment] = node_environment
       Puppet::Node.new(node_name, options)
     end
     module_function :node
@@ -67,6 +69,7 @@ module PuppetlabsSpec
       # exists.  This is a hack, but at least it's a hidden hack and not an
       # exposed hack.
       return nil unless Puppet::Parser::Functions.function(name)
+
       scope.method("function_#{name}".intern)
     end
     module_function :function_method

data/lib/puppetlabs_spec_helper/puppetlabs_spec_helper.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # Define the main module namespace for use by the helper modules
 module PuppetlabsSpec
   # FIXTURE_DIR represents the standard locations of all fixture data. Normally
   # this represents <project>/spec/fixtures. This will be used by the fixtures
   # library to find relative fixture data.
-  FIXTURE_DIR = File.join("spec", "fixtures") unless defined?(FIXTURE_DIR)
+  FIXTURE_DIR = File.join('spec', 'fixtures') unless defined?(FIXTURE_DIR)
 end
 
 # Require all necessary helper libraries so they can be used later