Merge pull request #70 from OpenVoxProject/test_fixes

Test fixes

Author: nmburgan

Gemfile

@@ -59,7 +59,7 @@ group(:test) do
   gem 'rubocop-i18n', '~> 3.0', require: false, platforms: [:ruby]
   gem 'rubocop-performance', '~> 1.0', require: false, platforms: [:ruby]
   gem 'rubocop-rake', '~> 0.6', require: false, platforms: [:ruby]
-  gem 'rubocop-rspec', '~> 2.0', require: false, platforms: [:ruby]
+  gem 'rubocop-rspec', '~> 3.0', require: false, platforms: [:ruby]
 end
 
 group(:development, optional: true) do

Rakefile

@@ -99,7 +99,7 @@ end
 
 task :spec do
   ENV["LOG_SPEC_ORDER"] = "true"
-  sh %{rspec #{ENV['TEST'] || ENV['TESTS'] || 'spec'}}
+  sh %{rspec #{ENV['TEST'] || ENV['TESTS'] || ENV['SPEC'] || 'spec'}}
 end
 
 begin

spec/unit/file_serving/configuration_spec.rb

@@ -16,7 +16,8 @@
   end
 
   it "should make :new a private method" do
-    expect { Puppet::FileServing::Configuration.new }.to raise_error(NoMethodError, /private method 'new' called for class Puppet::FileServing::Configuration/)
+    # Ruby 3.3 includes "class" in the error, 3.2 does not.
+    expect { Puppet::FileServing::Configuration.new }.to raise_error(NoMethodError, /private method `new' called for( class)? Puppet::FileServing::Configuration/)
   end
 
   it "should return the same configuration each time 'configuration' is called" do

spec/unit/functions/join_spec.rb

@@ -24,7 +24,7 @@
   end
 
   it 'does not flatten arrays nested in hashes' do
-    expect(compile_to_catalog("notify { join([1,2,{a => [3,4]}]): }")).to have_resource('Notify[12{"a" => [3, 4]}]')
+    expect(compile_to_catalog("notify { join([1,2,{a => [3,4]}]): }")).to have_resource('Notify[12{"a"=>[3, 4]}]')
   end
 
   it 'formats nil/undef as empty string' do

spec/unit/graph/sequential_prioritizer_spec.rb

@@ -27,6 +27,6 @@
   it "fails to prioritize a key contained in an unknown container" do
     expect do
       priorities.generate_priority_contained_in("unknown", "child 1")
-    end.to raise_error(NoMethodError, /undefined method 'down' for nil/)
+    end.to raise_error(NoMethodError, /undefined method `down' for nil/)
   end
 end

spec/unit/network/formats_spec.rb

@@ -461,7 +461,7 @@ def self.from_binary(data)
         []                => "",
         [1, 2]            => "1\n2\n",
         ["one"]           => "one\n",
-        [{1 => 1}]        => "{1 => 1}\n",
+        [{1 => 1}]        => "{1=>1}\n",
         [[1, 2], [3, 4]]  => "[1, 2]\n[3, 4]\n"
       }.each_pair do |input, output|
         it "should render #{input.inspect} as one item per line" do
@@ -476,7 +476,7 @@ def self.from_binary(data)
         {1 => 2}                             => "1  2\n",
         {"one" => "two"}                     => "one  \"two\"\n", # odd that two is quoted but one isn't
         {[1,2] => 3, [2,3] => 5, [3,4] => 7} => "{\n  \"[1, 2]\": 3,\n  \"[2, 3]\": 5,\n  \"[3, 4]\": 7\n}",
-        {{1 => 2} => {3 => 4}}               => "{\n  \"{1 => 2}\": {\n    \"3\": 4\n  }\n}"
+        {{1 => 2} => {3 => 4}}               => "{\n  \"{1=>2}\": {\n    \"3\": 4\n  }\n}"
       }.each_pair do |input, output|
         it "should render #{input.inspect}" do
           expect(console.render(input)).to eq(output)

spec/unit/parser/functions/generate_spec.rb

@@ -90,7 +90,8 @@ def with_executor
           echo $PWD
         END
         Puppet::FileSystem.chmod(0755, command)
-        expect(scope.function_generate([command]).chomp).to eq(cwd)
+        # Using a matcher to avoid /var vs. /private/var shenanigans on MacOS
+        expect(scope.function_generate([command]).chomp).to match(/#{cwd}/)
       end
     end
   end

spec/unit/parser/functions/sprintf_spec.rb

@@ -57,7 +57,7 @@
 
   it 'a hash with string keys that is output formats as strings' do
     result = @scope.function_sprintf(["%s", {'foo' => 1, 'bar' => 2}])
-    expect(result).to eq("{\"foo\" => 1, \"bar\" => 2}")
+    expect(result).to eq("{\"foo\"=>1, \"bar\"=>2}")
   end
 
   it 'named arguments hash with non string keys are tolerated' do

spec/unit/parser/functions/template_spec.rb

@@ -32,12 +32,12 @@
     it "raises an error when accessing an undefined variable" do
       expect {
         eval_template("template <%= deprecated %>")
-      }.to raise_error(Puppet::ParseError, /undefined local variable or method 'deprecated'/)
+      }.to raise_error(Puppet::ParseError, /undefined local variable or method `deprecated'/)
     end
 
     it "looks up the value from the scope" do
       scope["deprecated"] = "deprecated value"
-      expect { eval_template("template <%= deprecated %>")}.to raise_error(/undefined local variable or method 'deprecated'/)
+      expect { eval_template("template <%= deprecated %>")}.to raise_error(/undefined local variable or method `deprecated'/)
     end
 
     it "still has access to Kernel methods" do
@@ -74,7 +74,7 @@
   it "does not have direct access to Scope#lookupvar" do
     expect {
       eval_template("<%= lookupvar('myvar') %>")
-    }.to raise_error(Puppet::ParseError, /undefined method 'lookupvar'/)
+    }.to raise_error(Puppet::ParseError, /undefined method `lookupvar'/)
   end
 
   it 'is not available when --tasks is on' do

spec/unit/parser/templatewrapper_spec.rb

@@ -74,7 +74,7 @@
 
   it "raises error on access to removed in-scope variables via method calls" do
     scope["in_scope_variable"] = "is good"
-    expect { tw.result("<%= in_scope_variable %>") }.to raise_error(/undefined local variable or method 'in_scope_variable'/ )
+    expect { tw.result("<%= in_scope_variable %>") }.to raise_error(/undefined local variable or method `in_scope_variable'/ )
   end
 
   it "reports that variable is available when it is in scope" do