add ci_env rspec var and adjust cli unit test for ci

Author: mschuchard

spec/puppet-check/cli_spec.rb

@@ -6,7 +6,11 @@
     it 'targets the current working directory if no paths were specified' do
       expect { PuppetCheck::CLI.run(%w[--fail-on-warnings]) }.not_to raise_exception
       expect(PuppetCheck.files[:clean].length).to eql(30)
-      expect(PuppetCheck.files[:ignored].length).to eql(7)
+      if ci_env
+        expect(PuppetCheck.files[:ignored].length).to eql(8)
+      else
+        expect(PuppetCheck.files[:ignored].length).to eql(7)
+      end
     end
   end
 

spec/puppet-check/regression_check_spec.rb

@@ -19,7 +19,7 @@
 
     context '.smoke' do
       # octocatalog-diff is returning a blank error for these tests
-      unless ENV['CIRCLECI'] == 'true' || ENV['GITHUB_ACTIONS'] == 'true'
+      unless ci_env
         it 'returns a pass for a successful catalog compilation' do
           expect { RegressionCheck.smoke(['good.example.com'], "#{octocatalog_diff_dir}octocatalog_diff.cfg.rb") }.not_to raise_exception
         end

spec/puppet-check/rspec_puppet_support_spec.rb

@@ -15,7 +15,7 @@
 
     it 'creates missing directories, missing site.pp, missing symlinks, and a missing spec_helper' do
       # circle ci and gh actions
-      if ENV['CIRCLECI'] == 'true' || ENV['GITHUB_ACTIONS'] == 'true'
+      if ci_env
         expect { rspec_puppet_setup }.to output("git is not installed and cannot be used to retrieve dependency modules\nsubversion is not installed and cannot be used to retrieve dependency modules\npuppetlabs/gruntmaster has an unspecified, or specified but unsupported, download method.\n").to_stderr
       else
         expect { rspec_puppet_setup }.to output("subversion is not installed and cannot be used to retrieve dependency modules\npuppetlabs/gruntmaster has an unspecified, or specified but unsupported, download method.\n").to_stderr
@@ -29,7 +29,7 @@
       expect(File.file?('spec/spec_helper.rb')).to be true
 
       # .dependency_setup
-      expect(File.directory?('spec/fixtures/modules/puppetlabs-lvm')).to be true unless ENV['CIRCLECI'] == 'true' || ENV['GITHUB_ACTIONS'] == 'true'
+      expect(File.directory?('spec/fixtures/modules/puppetlabs-lvm')).to be true unless ci_env
       expect(File.directory?('spec/fixtures/modules/stdlib')).to be true
     end
   end

spec/puppet-check/ruby_parser_spec.rb

@@ -23,7 +23,7 @@
       RubyParser.ruby(["#{fixtures_dir}lib/style.rb"], true, [])
       expect(PuppetCheck.files[:errors]).to eql({})
       expect(PuppetCheck.files[:warnings].keys).to eql(["#{fixtures_dir}lib/style.rb"])
-      unless ENV['CIRCLECI'] == 'true' || ENV['GITHUB_ACTIONS'] == 'true'
+      unless ci_env
         expect(PuppetCheck.files[:warnings]["#{fixtures_dir}lib/style.rb"].join("\n")).to match(/Useless assignment.*\n.*Use the new.*\n.*Do not introduce.*\n.*Prefer single.*\n.*Remove unnecessary empty.*\n.*Source code comment is empty.*\n.*is a writable attribute.*\n.*Issue has no descriptive comment/)
       else
         expect(PuppetCheck.files[:warnings]["#{fixtures_dir}lib/style.rb"].join("\n")).to match(/Useless assignment.*\n.*Use the new.*\n.*Do not introduce.*\n.*Prefer single.*\n.*Remove unnecessary empty.*\n.*Source code comment is empty/)

spec/puppet_check_spec.rb

@@ -87,7 +87,7 @@
 
     it 'correctly parses one directory and returns all of its files' do
       dir.each { |file| expect(File.file?(file)).to be true }
-      if ENV['CIRCLECI'] == 'true' || ENV['GITHUB_ACTIONS'] == 'true'
+      if ci_env
         expect(dir.length).to eql(37)
       else
         expect(dir.length).to eql(40)

spec/spec_helper.rb

@@ -11,6 +11,10 @@ def fixtures_dir
   def octocatalog_diff_dir
     @octocatalog_diff_dir = "#{File.dirname(__FILE__)}/octocatalog-diff/"
   end
+
+  def ci_env
+    @ci_env = ENV['CIRCLECI'] == 'true' || ENV['GITHUB_ACTIONS'] == 'true'
+  end
 end
 
 RSpec.configure do |config|