puppet-syntax 3.3.0 → 4.0.1

data/lib/puppet-syntax/manifests.rb

@@ -1,7 +1,8 @@
 module PuppetSyntax
   class Manifests
     def check(filelist)
-      raise "Expected an array of files" unless filelist.is_a?(Array)
+      raise 'Expected an array of files' unless filelist.is_a?(Array)
+
       require 'puppet'
       require 'puppet/version'
       require 'puppet/face'
@@ -21,14 +22,12 @@ module PuppetSyntax
         Puppet::Test::TestHelper.before_each_test
         begin
           error = validate_manifest(puppet_file)
-          if error.is_a?(Hash) # Puppet 6.5.0 onwards
-            output << error.values.first unless error.empty?
-          end
+          output << error.values.first if error.is_a?(Hash) && !error.empty? # Puppet 6.5.0 onwards
         rescue SystemExit
           # Disregard exit(1) from face.
           # This is how puppet < 6.5.0 `validate_manifest` worked.
-        rescue => error
-          output << error
+        rescue StandardError => e
+          output << e
         ensure
           Puppet::Test::TestHelper.after_each_test
         end
@@ -38,30 +37,31 @@ module PuppetSyntax
       output.map! { |e| e.to_s }
 
       # Exported resources will raise warnings when outside a puppetmaster.
-      output.reject! { |e|
+      output.reject! do |e|
         e =~ /^You cannot collect( exported resources)? without storeconfigs being set/
-      }
+      end
 
       # tag and schedule parameters in class raise warnings notice in output that prevent from succeed
-      output.reject! { |e|
+      output.reject! do |e|
         e =~ /^(tag|schedule) is a metaparam; this value will inherit to all contained resources in the /
-      }
+      end
 
-      deprecations = output.select { |e|
+      deprecations = output.select do |e|
         e =~ /^Deprecation notice:|is deprecated/
-      }
+      end
 
       # Errors exist if there is any output that isn't a deprecation notice.
       has_errors = (output != deprecations)
 
-      return output, has_errors
+      [output, has_errors]
     ensure
       Puppet::Test::TestHelper.after_all_tests if called_before_all_tests
     end
 
     private
+
     def validate_manifest(file)
-      Puppet[:tasks] = true if Puppet::Util::Package.versioncmp(Puppet.version, '5.4.0') >= 0 and file.match(/.*plans\/.*\.pp$/)
+      Puppet[:tasks] = true if %r{.*plans/.*\.pp$}.match?(file)
       Puppet::Face[:parser, :current].validate(file)
     end
   end

data/lib/puppet-syntax/tasks/puppet-syntax.rb

@@ -25,9 +25,9 @@ module PuppetSyntax
       filelist(PuppetSyntax.hieradata_paths)
     end
 
-    def initialize(*args)
-      desc 'Syntax check Puppet manifests and templates'
-      task :syntax => [
+    def initialize(*_args)
+      desc 'Syntax check for Puppet manifests, templates and Hiera'
+      task syntax: [
         'syntax:manifests',
         'syntax:templates',
         'syntax:hiera',
@@ -36,39 +36,40 @@ module PuppetSyntax
       namespace :syntax do
         desc 'Syntax check Puppet manifests'
         task :manifests do |t|
-          $stderr.puts "---> #{t.name}"
+          warn "---> #{t.name}"
 
           c = PuppetSyntax::Manifests.new
           output, has_errors = c.check(filelist_manifests)
           $stdout.puts "#{output.join("\n")}\n" unless output.empty?
-          exit 1 if has_errors || ( output.any? && PuppetSyntax.fail_on_deprecation_notices )
+          exit 1 if has_errors || (output.any? && PuppetSyntax.fail_on_deprecation_notices)
         end
 
         desc 'Syntax check Puppet templates'
         task :templates do |t|
-          $stderr.puts "---> #{t.name}"
+          warn "---> #{t.name}"
 
           c = PuppetSyntax::Templates.new
           result = c.check(filelist_templates)
           unless result[:warnings].empty?
-            $stdout.puts "WARNINGS:"
+            $stdout.puts 'WARNINGS:'
             $stdout.puts result[:warnings].join("\n")
           end
           unless result[:errors].empty?
-            $stderr.puts "ERRORS:"
-            $stderr.puts result[:errors].join("\n")
+            warn 'ERRORS:'
+            warn result[:errors].join("\n")
             exit 1
           end
         end
 
         desc 'Syntax check Hiera config files'
-        task :hiera => [
+        task hiera: [
           'syntax:hiera:yaml',
         ]
 
         namespace :hiera do
           task :yaml do |t|
-            $stderr.puts "---> #{t.name}"
+            warn "---> #{t.name}"
+            warn "#{t.name} was called, but PuppetSyntax.check_hiera_keys is false. hiera syntax won't be checked" unless PuppetSyntax.check_hiera_keys
             c = PuppetSyntax::Hiera.new
             errors = c.check(filelist_hiera_yaml)
             $stdout.puts "#{errors.join("\n")}\n" unless errors.empty?

data/lib/puppet-syntax/templates.rb

@@ -4,10 +4,10 @@ require 'stringio'
 module PuppetSyntax
   class Templates
     def check(filelist)
-      raise "Expected an array of files" unless filelist.is_a?(Array)
+      raise 'Expected an array of files' unless filelist.is_a?(Array)
 
       # We now have to redirect STDERR in order to capture warnings.
-      $stderr = warnings = StringIO.new()
+      $stderr = warnings = StringIO.new
       result = { warnings: [], errors: [] }
 
       filelist.each do |file|
@@ -16,7 +16,7 @@ module PuppetSyntax
         elsif File.extname(file) == '.erb'
           tmp = validate_erb(file)
         end
-        result.merge!(tmp) { |k, a, b| a.concat(b) } unless tmp.nil?
+        result.merge!(tmp) { |_k, a, b| a.concat(b) } unless tmp.nil?
       end
 
       $stderr = STDERR
@@ -29,12 +29,11 @@ module PuppetSyntax
     end
 
     def validate_epp(filename)
-      require 'puppet/error'
-      require 'puppet/pops'
+      require 'puppet'
       result = { warnings: [], errors: [] }
       formatter = Puppet::Pops::Validation::DiagnosticFormatterPuppetStyle.new
-      evaluating_parser = Puppet::Pops::Parser::EvaluatingParser::EvaluatingEppParser.new()
-      parser = evaluating_parser.parser()
+      evaluating_parser = Puppet::Pops::Parser::EvaluatingParser::EvaluatingEppParser.new
+      parser = evaluating_parser.parser
       begin
         parse_result = parser.parse_file(filename)
         validation_result = evaluating_parser.validate(parse_result.model)
@@ -56,10 +55,10 @@ module PuppetSyntax
           column = err.source_pos.pos
           result[:errors] << "#{file}:#{line}:#{column}: #{message}"
         end
-      rescue Puppet::ParseError, SyntaxError => exc
-        result[:errors] << exc
-      rescue => exc
-        result[:errors] << exc
+      rescue Puppet::ParseError, SyntaxError => e
+        result[:errors] << e
+      rescue StandardError => e
+        result[:errors] << e
       end
 
       result
@@ -73,18 +72,18 @@ module PuppetSyntax
         erb = if RUBY_VERSION >= '2.6'
                 ERB.new(template, trim_mode: '-')
               else
-                ERB.new(template, nil, '-')
+                ERB.new(template, trim_mode: '-')
               end
         erb.filename = filename
         erb.result
-      rescue NameError => error
+      rescue NameError => e
         # This is normal because we don't have the variables that would
         # ordinarily be bound by the parent Puppet manifest.
       rescue TypeError
         # This is normal because we don't have the variables that would
         # ordinarily be bound by the parent Puppet manifest.
-      rescue SyntaxError => error
-        result[:errors] << error
+      rescue SyntaxError => e
+        result[:errors] << e
       end
 
       result

data/lib/puppet-syntax/version.rb

@@ -1,3 +1,3 @@
 module PuppetSyntax
-  VERSION = '3.3.0'
+  VERSION = '4.0.1'
 end

data/lib/puppet-syntax.rb

@@ -1,4 +1,4 @@
-require "puppet-syntax/version"
+require 'puppet-syntax/version'
 
 module PuppetSyntax
   autoload :Hiera, 'puppet-syntax/hiera'
@@ -7,16 +7,16 @@ module PuppetSyntax
 
   @exclude_paths = []
   @hieradata_paths = [
-    "**/data/**/*.*{yaml,yml}",
-    "hieradata/**/*.*{yaml,yml}",
-    "hiera*.*{yaml,yml}"
+    '**/data/**/*.*{yaml,yml}',
+    'hieradata/**/*.*{yaml,yml}',
+    'hiera*.*{yaml,yml}',
   ]
   @manifests_paths = [
-    '**/*.pp'
+    '**/*.pp',
   ]
   @templates_paths = [
     '**/templates/**/*.erb',
-    '**/templates/**/*.epp'
+    '**/templates/**/*.epp',
   ]
   @fail_on_deprecation_notices = true
   @check_hiera_keys = false

data/puppet-syntax.gemspec

@@ -1,28 +1,28 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'puppet-syntax/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "puppet-syntax"
+  spec.name          = 'puppet-syntax'
   spec.version       = PuppetSyntax::VERSION
-  spec.authors       = ["Vox Pupuli"]
-  spec.email         = ["voxpupuli@groups.io"]
-  spec.description   = %q{Syntax checks for Puppet manifests and templates}
-  spec.summary       = %q{Syntax checks for Puppet manifests, templates, and Hiera YAML}
-  spec.homepage      = "https://github.com/voxpupuli/puppet-syntax"
-  spec.license       = "MIT"
+  spec.authors       = ['Vox Pupuli']
+  spec.email         = ['voxpupuli@groups.io']
+  spec.description   = 'Syntax checks for Puppet manifests and templates'
+  spec.summary       = 'Syntax checks for Puppet manifests, templates, and Hiera YAML'
+  spec.homepage      = 'https://github.com/voxpupuli/puppet-syntax'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.required_ruby_version = ">= 2.4"
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_dependency "rake"
-  spec.add_dependency "puppet", ">= 5"
+  spec.add_dependency 'puppet', '>= 7', '< 9'
+  spec.add_dependency 'rake', '~> 13.1'
 
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rb-readline"
+  spec.add_development_dependency 'pry', '~> 0.14.2'
+  spec.add_development_dependency 'rb-readline', '~> 0.5.5'
+
+  spec.add_development_dependency 'voxpupuli-rubocop', '~> 2.5.0'
 end

data/spec/puppet-syntax/hiera_spec.rb

@@ -3,31 +3,30 @@ require 'spec_helper'
 describe PuppetSyntax::Hiera do
   let(:subject) { PuppetSyntax::Hiera.new }
 
-  it 'should expect an array of files' do
+  it 'expects an array of files' do
     expect { subject.check(nil) }.to raise_error(/Expected an array of files/)
   end
 
-  it "should return nothing from valid YAML" do
+  it 'returns nothing from valid YAML' do
     files = fixture_hiera('hiera_good.yaml')
     res = subject.check(files)
-    expect(res).to be == []
+    expect(res).to eq []
   end
 
-  it "should return an error from invalid YAML" do
-    hiera_yaml = RUBY_VERSION =~ /1.8/ ? 'hiera_bad_18.yaml' : 'hiera_bad.yaml'
-    files = fixture_hiera(hiera_yaml)
+  it 'returns an error from invalid YAML' do
+    files = fixture_hiera('hiera_bad.yaml')
     expected = /ERROR: Failed to parse #{files[0]}:/
     res = subject.check(files)
-    expect(res.size).to be == 1
+    expect(res.size).to eq 1
     expect(res.first).to match(expected)
   end
 
   context 'check_hiera_keys = true' do
-    before(:each) {
+    before do
       PuppetSyntax.check_hiera_keys = true
-    }
+    end
 
-    it "should return warnings for invalid keys" do
+    it 'returns warnings for invalid keys' do
       hiera_yaml = 'hiera_badkey.yaml'
       examples = 5
       files = fixture_hiera(hiera_yaml)
@@ -35,7 +34,7 @@ describe PuppetSyntax::Hiera do
       (1..examples).each do |n|
         expect(res).to include(/::warning#{n}/)
       end
-      expect(res.size).to be == examples
+      expect(res.size).to eq examples
       expect(res[0]).to match('Key :typical:typo::warning1: Looks like a missing colon')
       expect(res[1]).to match('Key ::notsotypical::warning2: Puppet automatic lookup will not use leading \'::\'')
       expect(res[2]).to match('Key :noCamelCase::warning3: Not a valid Puppet variable name for automatic lookup')
@@ -43,7 +42,7 @@ describe PuppetSyntax::Hiera do
       expect(res[4]).to match('Key :picky::warning5: Puppet automatic lookup will not look up symbols')
     end
 
-    it "should return warnings for bad eyaml values" do
+    it 'returns warnings for bad eyaml values' do
       hiera_yaml = 'hiera_bad.eyaml'
       examples = 6
       files = fixture_hiera(hiera_yaml)
@@ -51,7 +50,7 @@ describe PuppetSyntax::Hiera do
       (1..examples).each do |n|
         expect(res).to include(/::warning#{n}/)
       end
-      expect(res.size).to be == examples
+      expect(res.size).to eq examples
       expect(res[0]).to match('Key acme::warning1 has unknown eyaml method unknown-method')
       expect(res[1]).to match('Key acme::warning2 has unterminated eyaml value')
       expect(res[2]).to match('Key acme::warning3 has unpadded or truncated base64 data')
@@ -60,12 +59,11 @@ describe PuppetSyntax::Hiera do
       expect(res[5]).to match('Key acme::warning6\[\'hash_key\'\]\[2\] has corrupt base64 data')
     end
 
-    it "should handle empty files" do
+    it 'handles empty files' do
       hiera_yaml = 'hiera_key_empty.yaml'
       files = fixture_hiera(hiera_yaml)
       res = subject.check(files)
       expect(res).to be_empty
     end
-
   end
 end

data/spec/puppet-syntax/manifests_spec.rb

@@ -4,11 +4,11 @@ require 'puppet'
 describe PuppetSyntax::Manifests do
   let(:subject) { PuppetSyntax::Manifests.new }
 
-  it 'should expect an array of files' do
+  it 'expects an array of files' do
     expect { subject.check(nil) }.to raise_error(/Expected an array of files/)
   end
 
-  it 'should return nothing from a valid file' do
+  it 'returns nothing from a valid file' do
     files = fixture_manifests('pass.pp')
     output, has_errors = subject.check(files)
 
@@ -16,7 +16,7 @@ describe PuppetSyntax::Manifests do
     expect(has_errors).to eq(false)
   end
 
-  it 'should return nothing from a valid file with a class using tag parameter' do
+  it 'returns nothing from a valid file with a class using tag parameter' do
     files = fixture_manifests('tag_notice.pp')
     output, has_errors = subject.check(files)
 
@@ -24,7 +24,7 @@ describe PuppetSyntax::Manifests do
     expect(has_errors).to eq(false)
   end
 
-  it 'should return nothing from a valid file with a class using schedule parameter' do
+  it 'returns nothing from a valid file with a class using schedule parameter' do
     files = fixture_manifests('schedule_notice.pp')
     output, has_errors = subject.check(files)
 
@@ -32,7 +32,7 @@ describe PuppetSyntax::Manifests do
     expect(has_errors).to eq(false)
   end
 
-  it 'should return an error from an invalid file' do
+  it 'returns an error from an invalid file' do
     files = fixture_manifests('fail_error.pp')
     output, has_errors = subject.check(files)
 
@@ -41,7 +41,7 @@ describe PuppetSyntax::Manifests do
     expect(has_errors).to eq(true)
   end
 
-  it 'should return a warning from an invalid file' do
+  it 'returns a warning from an invalid file' do
     files = fixture_manifests('fail_warning.pp')
     output, has_errors = subject.check(files)
 
@@ -52,16 +52,15 @@ describe PuppetSyntax::Manifests do
     expect(output[1]).to match(/Unrecogni(s|z)ed escape sequence '\\\]'/)
   end
 
-  it 'should ignore warnings about storeconfigs' do
+  it 'ignores warnings about storeconfigs' do
     files = fixture_manifests('pass_storeconfigs.pp')
     output, has_errors = subject.check(files)
 
     expect(output).to eq([])
     expect(has_errors).to eq(false)
-
   end
 
-  it 'should read more than one valid file' do
+  it 'reads more than one valid file' do
     files = fixture_manifests(['pass.pp', 'pass_storeconfigs.pp'])
     output, has_errors = subject.check(files)
 
@@ -69,27 +68,27 @@ describe PuppetSyntax::Manifests do
     expect(has_errors).to eq(false)
   end
 
-  it 'should continue after finding an error in the first file' do
+  it 'continues after finding an error in the first file' do
     files = fixture_manifests(['fail_error.pp', 'fail_warning.pp'])
     output, has_errors = subject.check(files)
 
     expect(has_errors).to eq(true)
     expect(output.size).to eq(5)
-    expect(output[0]).to match(/This Name has no effect. A Host Class Definition can not end with a value-producing expression without other effect \(file: \S*\/fail_error.pp, line: 2, column: 32\)$/)
-    expect(output[1]).to match(/This Name has no effect. A value was produced and then forgotten \(one or more preceding expressions may have the wrong form\) \(file: \S*\/fail_error.pp, line: 2, column: 3\)$/)
+    expect(output[0]).to match(%r{This Name has no effect. A Host Class Definition can not end with a value-producing expression without other effect \(file: \S*/fail_error.pp, line: 2, column: 32\)$})
+    expect(output[1]).to match(%r{This Name has no effect. A value was produced and then forgotten \(one or more preceding expressions may have the wrong form\) \(file: \S*/fail_error.pp, line: 2, column: 3\)$})
     expect(output[2]).to match('2 errors. Giving up')
     expect(output[3]).to match(/Unrecogni(s|z)ed escape sequence '\\\['/)
     expect(output[4]).to match(/Unrecogni(s|z)ed escape sequence '\\\]'/)
   end
 
   describe 'deprecation notices' do
-    it 'should instead be failures' do
+    it 'insteads be failures' do
       files = fixture_manifests('deprecation_notice.pp')
       output, has_errors = subject.check(files)
 
       expect(has_errors).to eq(true)
       expect(output.size).to eq(1)
-      expect(output[0]).to match (/Node inheritance is not supported in Puppet >= 4.0.0/)
+      expect(output[0]).to match(/Node inheritance is not supported in Puppet >= 4.0.0/)
     end
   end
 end

data/spec/puppet-syntax/tasks/puppet-syntax_spec.rb

@@ -9,25 +9,25 @@ known_yaml_subdir = 'spec/fixtures/hiera/data/test/hiera_3.yaml'
 known_eyaml_subdir = 'spec/fixtures/hiera/data/test/hiera_4.eyaml'
 
 describe 'PuppetSyntax rake tasks' do
-  it 'should filter directories' do
+  it 'filters directories' do
     list = PuppetSyntax::RakeTask.new.filelist(['**/lib', known_pp])
     expect(list.count).to eq 1
     expect(list).to include(known_pp)
   end
 
-  it 'should generate FileList of manifests relative to Rakefile' do
+  it 'generates FileList of manifests relative to Rakefile' do
     list = PuppetSyntax::RakeTask.new.filelist_manifests
     expect(list).to include(known_pp)
     expect(list.count).to eq 9
   end
 
-  it 'should generate FileList of templates relative to Rakefile' do
+  it 'generates FileList of templates relative to Rakefile' do
     list = PuppetSyntax::RakeTask.new.filelist_templates
     expect(list).to include(known_erb)
     expect(list.count).to eq 9
   end
 
-  it 'should generate FileList of Hiera yaml files relative to Rakefile' do
+  it 'generates FileList of Hiera yaml files relative to Rakefile' do
     list = PuppetSyntax::RakeTask.new.filelist_hiera_yaml
     expect(list).to include(known_yaml)
     expect(list).to include(known_eyaml)

data/spec/puppet-syntax/templates_spec.rb

@@ -4,17 +4,17 @@ describe PuppetSyntax::Templates do
   let(:subject) { PuppetSyntax::Templates.new }
   let(:conditional_warning_regex) do
     if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
-      %r{2: warning: found `= literal' in conditional}
+      /2: warning: found `= literal' in conditional/
     else
-      %r{2: warning: found = in conditional}
+      /2: warning: found = in conditional/
     end
   end
 
-  it 'should expect an array of files' do
+  it 'expects an array of files' do
     expect { subject.check(nil) }.to raise_error(/Expected an array of files/)
   end
 
-  it 'should return nothing from a valid file' do
+  it 'returns nothing from a valid file' do
     files = fixture_templates('pass.erb')
     res = subject.check(files)
 
@@ -22,7 +22,7 @@ describe PuppetSyntax::Templates do
     expect(res[:errors]).to match([])
   end
 
-  it 'should ignore NameErrors from unbound variables' do
+  it 'ignores NameErrors from unbound variables' do
     files = fixture_templates('pass_unbound_var.erb')
     res = subject.check(files)
 
@@ -30,7 +30,7 @@ describe PuppetSyntax::Templates do
     expect(res[:errors]).to match([])
   end
 
-  it 'should catch SyntaxError' do
+  it 'catches SyntaxError' do
     files = fixture_templates('fail_error.erb')
     res = subject.check(files)
 
@@ -38,7 +38,7 @@ describe PuppetSyntax::Templates do
     expect(res[:errors][0]).to match(/2: syntax error, unexpected/)
   end
 
-  it 'should catch Ruby warnings' do
+  it 'catches Ruby warnings' do
     files = fixture_templates('fail_warning.erb')
     res = subject.check(files)
 
@@ -46,7 +46,7 @@ describe PuppetSyntax::Templates do
     expect(res[:warnings][0]).to match(conditional_warning_regex)
   end
 
-  it 'should read more than one valid file' do
+  it 'reads more than one valid file' do
     files = fixture_templates(['pass.erb', 'pass_unbound_var.erb'])
     res = subject.check(files)
 
@@ -54,7 +54,7 @@ describe PuppetSyntax::Templates do
     expect(res[:errors]).to match([])
   end
 
-  it 'should continue after finding an error in the first file' do
+  it 'continues after finding an error in the first file' do
     files = fixture_templates(['fail_error.erb', 'fail_warning.erb'])
     res = subject.check(files)
 
@@ -64,7 +64,7 @@ describe PuppetSyntax::Templates do
     expect(res[:warnings][0]).to match(conditional_warning_regex)
   end
 
-  it 'should ignore a TypeError' do
+  it 'ignores a TypeError' do
     files = fixture_templates('typeerror_shouldwin.erb')
     res = subject.check(files)
 
@@ -72,7 +72,7 @@ describe PuppetSyntax::Templates do
     expect(res[:errors]).to match([])
   end
 
-  it 'should ignore files without .erb extension' do
+  it 'ignores files without .erb extension' do
     files = fixture_templates('ignore.tpl')
     res = subject.check(files)
 
@@ -80,7 +80,7 @@ describe PuppetSyntax::Templates do
     expect(res[:errors]).to match([])
   end
 
-  it 'should return nothing from a valid file' do
+  it 'returns nothing from a valid file' do
     files = fixture_templates('pass.epp')
     res = subject.check(files)
 
@@ -88,7 +88,7 @@ describe PuppetSyntax::Templates do
     expect(res[:errors]).to match([])
   end
 
-  it 'should catch SyntaxError' do
+  it 'catches SyntaxError' do
     files = fixture_templates('fail_error.epp')
     res = subject.check(files)
 
@@ -96,7 +96,7 @@ describe PuppetSyntax::Templates do
     expect(res[:errors][0]).to match(/This Type-Name has no effect/)
   end
 
-  it 'should read more than one valid file' do
+  it 'reads more than one valid file' do
     files = fixture_templates(['pass.epp', 'pass_also.epp'])
     res = subject.check(files)
 
@@ -104,7 +104,7 @@ describe PuppetSyntax::Templates do
     expect(res[:errors]).to match([])
   end
 
-  it 'should continue after finding an error in the first file' do
+  it 'continues after finding an error in the first file' do
     files = fixture_templates(['fail_error.epp', 'fail_error_also.epp'])
     res = subject.check(files)
 
@@ -114,11 +114,11 @@ describe PuppetSyntax::Templates do
   end
 
   context "when the 'epp_only' options is set" do
-    before(:each) {
+    before do
       PuppetSyntax.epp_only = true
-    }
+    end
 
-    it 'should process an ERB as EPP and find an error' do
+    it 'processes an ERB as EPP and find an error' do
       files = fixture_templates('pass.erb')
       res = subject.check(files)