(CONT-237) Rubocop - fixes for unit/acceptance

Author: chelnak

lib/puppetlabs_spec_helper/tasks/fixtures.rb

@@ -140,7 +140,7 @@ def fixtures(category)
         # rubocop:disable Security/Eval
         # TODO: Remove eval
         real_target = eval("\"#{opts['target']}\"", binding, __FILE__, __LINE__) # evaluating target reference in this context (see auto_symlink)
-        real_source = eval("\"#{opts['repo']}\"", binding, __FILE__, __LINE__) # evaluating repo reference in this context (see auto_symlink)t
+        real_source = eval("\"#{opts['repo']}\"", binding, __FILE__, __LINE__) # evaluating repo reference in this context (see auto_symlink)
 
         result[real_source] = validate_fixture_hash!(
           'target' => File.join(real_target, fixture),

spec/acceptance/smoke_spec.rb

@@ -5,10 +5,10 @@
 
 # some smoke tests to verify overall sanity
 RSpec.describe 'rake' do
-  before(:all) do
-    @output, @status = Open3.capture2e('rake', '--rakefile', 'spec/acceptance/fixtures/Rakefile', '-T')
+  let(:output) do
+    Open3.capture2e('rake', '--rakefile', 'spec/acceptance/fixtures/Rakefile', '-T')
   end
 
-  it { expect(@output).to match %r{spec_prep} }
-  it { expect(@status).to be_success }
+  it { expect(output[0]).to match %r{spec_prep} }
+  it { expect(output[1]).to be_success }
 end

spec/unit/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals_spec.rb

@@ -8,14 +8,14 @@
   end
 
   describe '.scope' do
-    let(:subject) { described_class.scope }
+    subject(:scope) { described_class.scope }
 
     it 'returns a Puppet::Parser::Scope instance' do
-      expect(subject).to be_a_kind_of Puppet::Parser::Scope
+      expect(scope).to be_a_kind_of Puppet::Parser::Scope
     end
 
     it 'is suitable for function testing' do
-      expect(subject.function_inline_template(['foo'])).to eq('foo')
+      expect(scope.function_inline_template(['foo'])).to eq('foo')
     end
 
     it 'accepts a compiler' do
@@ -25,29 +25,28 @@
     end
 
     it 'has a source set' do
-      scope = subject
       expect(scope.source).not_to be_nil
       expect(scope.source.name).to eq('foo')
     end
   end
 
   describe '.resource' do
-    let(:subject) { described_class.resource }
+    subject(:resource) { described_class.resource }
 
     it 'can have a defined type' do
       expect(described_class.resource(type: :node).type).to eq(:node)
     end
 
     it 'defaults to a type of hostclass' do
-      expect(subject.type).to eq(:hostclass)
+      expect(resource.type).to eq(:hostclass)
     end
 
     it 'can have a defined name' do
       expect(described_class.resource(name: 'testingrsrc').name).to eq('testingrsrc')
     end
 
     it 'defaults to a name of testing' do
-      expect(subject.name).to eq('testing')
+      expect(resource.name).to eq('testing')
     end
   end
 
@@ -82,14 +81,14 @@
   describe '.function_method' do
     it 'accepts an injected scope' do
       expect(Puppet::Parser::Functions).to receive(:function).with('my_func').and_return(true)
-      scope = double(described_class.scope)
+      scope = instance_double(described_class.scope.to_s)
       expect(scope).to receive(:method).with(:function_my_func).and_return(:fake_method)
       expect(described_class.function_method('my_func', scope: scope)).to eq(:fake_method)
     end
 
     it "returns nil if the function doesn't exist" do
       expect(Puppet::Parser::Functions).to receive(:function).with('my_func').and_return(false)
-      scope = double(described_class.scope)
+      scope = instance_double(described_class.scope.to_s)
       expect(described_class.function_method('my_func', scope: scope)).to be_nil
     end
   end

spec/unit/puppetlabs_spec_helper/tasks/fixtures_spec.rb

@@ -84,6 +84,8 @@
   end
 
   describe '.fixtures' do
+    subject(:helper) { described_class }
+
     before :each do
       # Unstub the fixtures "helpers"
       PuppetlabsSpec::Fixtures.instance_methods.each do |m|
@@ -98,48 +100,50 @@
 
     context 'when file is missing' do
       it 'returns basic directories per category' do
-        expect(subject.fixtures('forge_modules')).to eq({})
-        expect(subject.fixtures('repositories')).to eq({})
+        expect(helper.fixtures('forge_modules')).to eq({})
+        expect(helper.fixtures('repositories')).to eq({})
       end
     end
 
     context 'when file is empty' do
       it 'returns basic directories per category' do
         allow(File).to receive(:exist?).with('.fixtures.yml').and_return true
         allow(YAML).to receive(:load_file).with('.fixtures.yml').and_return false
-        expect(subject.fixtures('forge_modules')).to eq({})
-        expect(subject.fixtures('repositories')).to eq({})
+        expect(helper.fixtures('forge_modules')).to eq({})
+        expect(helper.fixtures('repositories')).to eq({})
       end
     end
 
     context 'when file is malformed' do
       it 'raises an error' do
         expect(File).to receive(:exist?).with('.fixtures.yml').and_return true
         expect(YAML).to receive(:load_file).with('.fixtures.yml').and_raise(Psych::SyntaxError.new('/file', '123', '0', '0', 'spec message', 'spec context'))
-        expect { subject.fixtures('forge_modules') }.to raise_error(RuntimeError, %r{malformed YAML})
+        expect { helper.fixtures('forge_modules') }.to raise_error(RuntimeError, %r{malformed YAML})
       end
     end
 
     context 'when file contains no fixtures' do
       it 'raises an error' do
         allow(File).to receive(:exist?).with('.fixtures.yml').and_return true
         allow(YAML).to receive(:load_file).with('.fixtures.yml').and_return('some' => 'key')
-        expect { subject.fixtures('forge_modules') }.to raise_error(RuntimeError, %r{No 'fixtures'})
+        expect { helper.fixtures('forge_modules') }.to raise_error(RuntimeError, %r{No 'fixtures'})
       end
     end
 
     context 'when file specifies fixtures' do
       it 'returns the hash' do
         allow(File).to receive(:exist?).with('.fixtures.yml').and_return true
         allow(YAML).to receive(:load_file).with('.fixtures.yml').and_return('fixtures' => { 'forge_modules' => { 'stdlib' => 'puppetlabs-stdlib' } })
-        expect(subject.fixtures('forge_modules')).to eq('puppetlabs-stdlib' => {
-                                                          'target' => 'spec/fixtures/modules/stdlib',
-                                                          'ref' => nil,
-                                                          'branch' => nil,
-                                                          'scm' => nil,
-                                                          'flags' => nil,
-                                                          'subdir' => nil,
-                                                        })
+        expect(helper.fixtures('forge_modules')).to eq(
+          'puppetlabs-stdlib' => {
+            'target' => 'spec/fixtures/modules/stdlib',
+            'ref' => nil,
+            'branch' => nil,
+            'scm' => nil,
+            'flags' => nil,
+            'subdir' => nil,
+          },
+        )
       end
     end
 
@@ -148,14 +152,16 @@
         allow(File).to receive(:exist?).with('.fixtures.yml').and_return true
         allow(YAML).to receive(:load_file).with('.fixtures.yml').and_return('defaults' => { 'forge_modules' => { 'flags' => '--module_repository=https://myforge.example.com/' } },
                                                                             'fixtures' => { 'forge_modules' => { 'stdlib' => 'puppetlabs-stdlib' } })
-        expect(subject.fixtures('forge_modules')).to eq('puppetlabs-stdlib' => {
-                                                          'target' => 'spec/fixtures/modules/stdlib',
-                                                          'ref' => nil,
-                                                          'branch' => nil,
-                                                          'scm' => nil,
-                                                          'flags' => '--module_repository=https://myforge.example.com/',
-                                                          'subdir' => nil,
-                                                        })
+        expect(helper.fixtures('forge_modules')).to eq(
+          'puppetlabs-stdlib' => {
+            'target' => 'spec/fixtures/modules/stdlib',
+            'ref' => nil,
+            'branch' => nil,
+            'scm' => nil,
+            'flags' => '--module_repository=https://myforge.example.com/',
+            'subdir' => nil,
+          },
+        )
       end
     end
 
@@ -170,14 +176,16 @@
       end
 
       it 'returns the hash' do
-        expect(subject.repositories).to eq('https://github.com/puppetlabs/puppetlabs-stdlib.git' => {
-                                             'target' => 'spec/fixtures/modules/stdlib',
-                                             'ref' => nil,
-                                             'branch' => nil,
-                                             'scm' => nil,
-                                             'flags' => nil,
-                                             'subdir' => nil,
-                                           })
+        expect(helper.repositories).to eq(
+          'https://github.com/puppetlabs/puppetlabs-stdlib.git' => {
+            'target' => 'spec/fixtures/modules/stdlib',
+            'ref' => nil,
+            'branch' => nil,
+            'scm' => nil,
+            'flags' => nil,
+            'subdir' => nil,
+          },
+        )
       end
     end
 
@@ -198,7 +206,7 @@
       end
 
       it 'raises an ArgumentError' do
-        expect { subject.fixtures('repositories') }.to raise_error(ArgumentError)
+        expect { helper.fixtures('repositories') }.to raise_error(ArgumentError)
       end
     end
 
@@ -219,7 +227,7 @@ def stub_fixtures(data)
             },
           },
         )
-        expect(subject.fixtures('forge_modules')).to include('puppetlabs-stdlib')
+        expect(helper.fixtures('forge_modules')).to include('puppetlabs-stdlib')
       end
 
       it 'excludes the fixture if the puppet version does not match', if: Gem::Version.new(Puppet::PUPPETVERSION) > Gem::Version.new('4') do
@@ -233,7 +241,7 @@ def stub_fixtures(data)
             },
           },
         )
-        expect(subject.fixtures('forge_modules')).to eq({})
+        expect(helper.fixtures('forge_modules')).to eq({})
       end
 
       it 'includes the fixture on obsolete puppet versions', if: Gem::Version.new(Puppet::PUPPETVERSION) <= Gem::Version.new('4') do
@@ -247,7 +255,7 @@ def stub_fixtures(data)
             },
           },
         )
-        expect(subject.fixtures('forge_modules')).to include('puppetlabs-stdlib')
+        expect(helper.fixtures('forge_modules')).to include('puppetlabs-stdlib')
       end
     end
   end

spec/watchr.rb

@@ -14,7 +14,7 @@ def growl(message)
             (Regexp.last_match(1).to_i == 0) ? '~/.watchr_images/passed.png' : '~/.watchr_images/failed.png'
           else
             '~/.watchr_images/unknown.png'
-  end
+          end
   options = "-w -n Watchr --image '#{File.expand_path(image)}' -m '#{message}' '#{title}'"
   system %(#{growlnotify} #{options} &)
 end
@@ -35,7 +35,7 @@ def run_spec_test(file)
 end
 
 def filter_rspec(data)
-  data.split("\n").find_all { |l|
+  data.split("\n").select { |l|
     l =~ %r{^(\d+)\s+exampl\w+.*?(\d+).*?failur\w+.*?(\d+).*?pending}
   }.join("\n")
 end