puppet-lint 4.1.0 → 4.2.1

data/spec/unit/puppet-lint/plugins/check_classes/arrow_on_right_operand_line_spec.rb

@@ -13,7 +13,7 @@ describe 'arrow_on_right_operand_line' do
         end
 
         it 'does not detect any problems' do
-          expect(problems).to have(0).problems
+          expect(problems).to be_empty
         end
       end
 
@@ -26,7 +26,7 @@ describe 'arrow_on_right_operand_line' do
         end
 
         it 'detects a problem' do
-          expect(problems).to have(1).problem
+          expect(problems.size).to eq(1)
         end
 
         it 'creates a warning' do
@@ -68,7 +68,7 @@ describe 'arrow_on_right_operand_line' do
         end
 
         it 'does not detect any problems' do
-          expect(problems).to have(0).problems
+          expect(problems).to be_empty
         end
       end
 
@@ -84,7 +84,7 @@ describe 'arrow_on_right_operand_line' do
         end
 
         it 'detects a problem' do
-          expect(problems).to have(1).problem
+          expect(problems.size).to eq(1)
         end
 
         it 'creates a warning' do
@@ -129,7 +129,7 @@ describe 'arrow_on_right_operand_line' do
         end
 
         it 'detects a problem' do
-          expect(problems).to have(1).problem
+          expect(problems.size).to eq(1)
         end
 
         it 'creates a warning' do

data/spec/unit/puppet-lint/plugins/check_classes/autoloader_layout_spec.rb

@@ -6,7 +6,7 @@ describe 'autoloader_layout' do
     let(:path) { 'foo/manifests/bar.pp' }
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -15,7 +15,7 @@ describe 'autoloader_layout' do
     let(:path) { 'foo/manifests/bar/baz.pp' }
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -24,7 +24,7 @@ describe 'autoloader_layout' do
     let(:path) { 'foo/manifests/init.pp' }
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -34,7 +34,7 @@ describe 'autoloader_layout' do
     let(:msg) { 'foo::bar not in autoload module layout' }
 
     it 'only detects a single problem' do
-      expect(problems).to have(1).problem
+      expect(problems.size).to eq(1)
     end
 
     it 'creates an error' do
@@ -56,7 +56,7 @@ describe 'autoloader_layout' do
     let(:path) { 'bar/manifests/init.pp' }
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -65,7 +65,7 @@ describe 'autoloader_layout' do
     let(:path) { 'puppet-foo/manifests/init.pp' }
 
     it 'detects a single problem' do
-      expect(problems).to have(1).problems
+      expect(problems.size).to eq(1)
     end
   end
 
@@ -82,7 +82,7 @@ describe 'autoloader_layout' do
     let(:path) { 'puppet-foo/manifests/bar.pp' }
 
     it 'detects a single problem' do
-      expect(problems).to have(1).problems
+      expect(problems.size).to eq(1)
     end
   end
 
@@ -99,7 +99,7 @@ describe 'autoloader_layout' do
     let(:path) { 'puppet-foo/manifests/init.pp' }
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 end

data/spec/unit/puppet-lint/plugins/check_classes/class_inherits_from_params_class_spec.rb

@@ -12,7 +12,7 @@ describe 'class_inherits_from_params_class' do
     end
 
     it 'only detects a single problem' do
-      expect(problems).to have(1).problem
+      expect(problems.size).to eq(1)
     end
 
     it 'creates a warning' do
@@ -33,7 +33,7 @@ describe 'class_inherits_from_params_class' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 end

data/spec/unit/puppet-lint/plugins/check_classes/code_on_top_scope_spec.rb

@@ -40,9 +40,10 @@ describe 'code_on_top_scope' do
       END
     end
 
+    it { expect(problems.size).to eq(4) }
+
     its(:problems) do
       is_expected.to contain_warning('code outside of class or define block - include')
-      is_expected.to have(4).problems
     end
   end
 end

data/spec/unit/puppet-lint/plugins/check_classes/inherits_across_namespaces_spec.rb

@@ -7,7 +7,7 @@ describe 'inherits_across_namespaces' do
     let(:code) { 'class foo::bar inherits foo { }' }
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -15,7 +15,7 @@ describe 'inherits_across_namespaces' do
     let(:code) { 'class foo::bar inherits foo::baz { }' }
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -23,7 +23,7 @@ describe 'inherits_across_namespaces' do
     let(:code) { 'class foo::bar inherits baz { }' }
 
     it 'only detects a single problem' do
-      expect(problems).to have(1).problem
+      expect(problems.size).to eq(1)
     end
 
     it 'creates a warning' do

data/spec/unit/puppet-lint/plugins/check_classes/name_contains_uppercase_spec.rb

@@ -7,7 +7,7 @@ describe 'names_containing_uppercase' do
     let(:class_msg) { "defined type 'FooBar' contains illegal uppercase" }
 
     it 'only detects a single problem' do
-      expect(problems).to have(1).problem
+      expect(problems.size).to eq(1)
     end
 
     it 'creates an error' do
@@ -21,7 +21,7 @@ describe 'names_containing_uppercase' do
     let(:class_msg) { "class 'FooBar' contains illegal uppercase" }
 
     it 'only detects a single problem' do
-      expect(problems).to have(1).problem
+      expect(problems.size).to eq(1)
     end
 
     it 'creates an error' do
@@ -35,7 +35,7 @@ describe 'names_containing_uppercase' do
     let(:class_msg) { "class 'Foo::BarFoo' contains illegal uppercase" }
 
     it 'only detects a single problem' do
-      expect(problems).to have(1).problem
+      expect(problems.size).to eq(1)
     end
 
     it 'creates an error' do

data/spec/unit/puppet-lint/plugins/check_classes/names_containing_dash_spec.rb

@@ -9,7 +9,7 @@ describe 'names_containing_dash' do
     let(:path) { 'foo-bar/manifests/init.pp' }
 
     it 'only detects a single problem' do
-      expect(problems).to have(1).problem
+      expect(problems.size).to eq(1)
     end
 
     it 'creates an error' do
@@ -22,7 +22,7 @@ describe 'names_containing_dash' do
     let(:path) { 'foo/manifests/foo-bar.pp' }
 
     it 'only detect a single problem' do
-      expect(problems).to have(1).problem
+      expect(problems.size).to eq(1)
     end
 
     it 'creates an error' do
@@ -35,7 +35,7 @@ describe 'names_containing_dash' do
     let(:path) { 'foo/manifests/bar-foo.pp' }
 
     it 'only detects a single problem' do
-      expect(problems).to have(1).problem
+      expect(problems.size).to eq(1)
     end
 
     it 'creates an error' do

data/spec/unit/puppet-lint/plugins/check_classes/nested_classes_or_defines_spec.rb

@@ -8,7 +8,7 @@ describe 'nested_classes_or_defines' do
     let(:code) { 'class foo { }' }
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -23,7 +23,7 @@ describe 'nested_classes_or_defines' do
     end
 
     it 'only detects a single problem' do
-      expect(problems).to have(1).problem
+      expect(problems.size).to eq(1)
     end
 
     it 'creates a warning' do
@@ -43,7 +43,7 @@ describe 'nested_classes_or_defines' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -59,7 +59,7 @@ describe 'nested_classes_or_defines' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -74,7 +74,7 @@ describe 'nested_classes_or_defines' do
     end
 
     it 'only detects a single problem' do
-      expect(problems).to have(1).problems
+      expect(problems.size).to eq(1)
     end
 
     it 'creates a warning' do

data/spec/unit/puppet-lint/plugins/check_classes/parameter_order_spec.rb

@@ -8,7 +8,7 @@ describe 'parameter_order' do
       let(:code) { "#{type} foo($bar, $baz='gronk') { }" }
 
       it 'does not detect any problems' do
-        expect(problems).to have(0).problems
+        expect(problems).to be_empty
       end
     end
 
@@ -16,7 +16,7 @@ describe 'parameter_order' do
       let(:code) { "#{type} foo($bar=extlookup($name)) {}" }
 
       it 'does not detect any problems' do
-        expect(problems).to have(0).problems
+        expect(problems).to be_empty
       end
     end
 
@@ -24,7 +24,7 @@ describe 'parameter_order' do
       let(:code) { "#{type} foo($bar='baz', $gronk) { }" }
 
       it 'only detects a single problem' do
-        expect(problems).to have(1).problem
+        expect(problems.size).to eq(1)
       end
 
       col = ((type == 'class') ? 23 : 24)
@@ -42,7 +42,7 @@ describe 'parameter_order' do
       end
 
       it 'does not detect any problems' do
-        expect(problems).to have(0).problems
+        expect(problems).to be_empty
       end
     end
 
@@ -55,7 +55,7 @@ describe 'parameter_order' do
       end
 
       it 'only detects a single problem' do
-        expect(problems).to have(1).problem
+        expect(problems.size).to eq(1)
       end
 
       col = ((type == 'class') ? 35 : 36)
@@ -76,7 +76,7 @@ describe 'parameter_order' do
       end
 
       it 'does not detect any problems' do
-        expect(problems).to have(0).problems
+        expect(problems).to be_empty
       end
     end
 
@@ -98,7 +98,7 @@ describe 'parameter_order' do
         END
       end
 
-      it { expect(problems).to have(0).problem }
+      it { expect(problems.size).to eq(0) }
     end
 
     context "#{type} parameter w/a hash containing a variable followed by an optional parameter" do
@@ -132,7 +132,7 @@ describe 'parameter_order' do
         END
       end
 
-      it { expect(problems).to have(0).problem }
+      it { expect(problems.size).to eq(0) }
     end
 
     context "#{type} parameter with array operation" do
@@ -150,7 +150,7 @@ describe 'parameter_order' do
         END
       end
 
-      it { expect(problems).to have(0).problems }
+      it { expect(problems).to be_empty }
     end
 
     context "#{type} parameters of Optional type are just regular parameters" do
@@ -163,7 +163,7 @@ describe 'parameter_order' do
         END
       end
 
-      it { expect(problems).to have(1).problems }
+      it { expect(problems.size).to eq(1) }
     end
 
     [['Custom::Type1', 'Custom::Type2'], ['Custom::Type1', 'String'], ['String', 'Custom::Type2']].each_with_index do |testtypes, i| # rubocop:disable Performance/CollectionLiteralInLoop
@@ -177,7 +177,7 @@ describe 'parameter_order' do
           END
         end
 
-        it { expect(problems).to have(0).problems }
+        it { expect(problems).to be_empty }
       end
 
       context "#{type} parameters of custom type - two values - #{i}" do
@@ -190,7 +190,7 @@ describe 'parameter_order' do
           END
         end
 
-        it { expect(problems).to have(0).problems }
+        it { expect(problems).to be_empty }
       end
 
       context "#{type} parameters of custom type - one value, wrong order - #{i}" do
@@ -203,7 +203,7 @@ describe 'parameter_order' do
           END
         end
 
-        it { expect(problems).to have(1).problems }
+        it { expect(problems.size).to eq(1) }
       end
 
       context "#{type} parameters of custom type - one value, right order - #{i}" do
@@ -216,7 +216,7 @@ describe 'parameter_order' do
           END
         end
 
-        it { expect(problems).to have(0).problems }
+        it { expect(problems).to be_empty }
       end
     end
   end

data/spec/unit/puppet-lint/plugins/check_classes/right_to_left_relationship_spec.rb

@@ -7,7 +7,7 @@ describe 'right_to_left_relationship' do
     let(:code) { 'Class[foo] -> Class[bar]' }
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -15,7 +15,7 @@ describe 'right_to_left_relationship' do
     let(:code) { 'Class[foo] <- Class[bar]' }
 
     it 'only detects a single problem' do
-      expect(problems).to have(1).problem
+      expect(problems.size).to eq(1)
     end
 
     it 'creates a warning' do

data/spec/unit/puppet-lint/plugins/check_classes/variable_scope_spec.rb

@@ -13,7 +13,7 @@ describe 'variable_scope' do
     end
 
     it 'only detects a single problem' do
-      expect(problems).to have(1).problem
+      expect(problems.size).to eq(1)
     end
 
     it 'creates a warning' do
@@ -31,7 +31,7 @@ describe 'variable_scope' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -46,7 +46,7 @@ describe 'variable_scope' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -65,7 +65,7 @@ describe 'variable_scope' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -80,7 +80,7 @@ describe 'variable_scope' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -94,7 +94,7 @@ describe 'variable_scope' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -108,7 +108,7 @@ describe 'variable_scope' do
     end
 
     it 'only detects a single problem' do
-      expect(problems).to have(1).problem
+      expect(problems.size).to eq(1)
     end
 
     it 'creates a warning' do
@@ -126,7 +126,7 @@ describe 'variable_scope' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -143,7 +143,7 @@ describe 'variable_scope' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -159,7 +159,7 @@ describe 'variable_scope' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -181,7 +181,7 @@ describe 'variable_scope' do
     end
 
     it 'only detects two problems' do
-      expect(problems).to have(2).problem
+      expect(problems.size).to eq(2)
     end
 
     it 'creates two warnings' do
@@ -213,7 +213,7 @@ describe 'variable_scope' do
     end
 
     it 'only detects three problems' do
-      expect(problems).to have(3).problem
+      expect(problems.size).to eq(3)
     end
 
     it 'creates three warnings' do
@@ -234,16 +234,16 @@ describe 'variable_scope' do
       end
 
       it 'does not detect any problems' do
-        expect(problems).to have(0).problems
+        expect(problems).to be_empty
       end
     end
   end
 
-  context 'support the use of facts and trusted facts for Puppet 3.5 onwards' do
+  context 'support the use of facts and trusted facts' do
     let(:code) do
       <<-END
         class foo() {
-          if $facts['osfamily'] == 'redhat' or $trusted['osfamily'] == 'redhat' {
+          if $facts['os']['family'] == 'redhat' or $trusted['os']['family'] == 'redhat' {
            $redhat = true
           }
         }
@@ -251,7 +251,7 @@ describe 'variable_scope' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -265,7 +265,7 @@ describe 'variable_scope' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -279,7 +279,7 @@ describe 'variable_scope' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -294,7 +294,7 @@ describe 'variable_scope' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 
@@ -309,7 +309,7 @@ describe 'variable_scope' do
     end
 
     it 'only detects one problem' do
-      expect(problems).to have(1).problems
+      expect(problems.size).to eq(1)
     end
 
     it 'creates one warning' do
@@ -327,7 +327,7 @@ describe 'variable_scope' do
     end
 
     it 'does not detect any problems' do
-      expect(problems).to have(0).problems
+      expect(problems).to be_empty
     end
   end
 end

data/spec/unit/puppet-lint/plugins/check_comments/slash_comments_spec.rb

@@ -8,7 +8,7 @@ describe 'slash_comments' do
       let(:code) { '// foo' }
 
       it 'only detects a single problem' do
-        expect(problems).to have(1).problem
+        expect(problems.size).to eq(1)
       end
 
       it 'creates a warning' do
@@ -30,7 +30,7 @@ describe 'slash_comments' do
       let(:code) { '// foo' }
 
       it 'only detects a single problem' do
-        expect(problems).to have(1).problem
+        expect(problems.size).to eq(1)
       end
 
       it 'fixes the manifest' do

data/spec/unit/puppet-lint/plugins/check_comments/star_comments_spec.rb

@@ -13,7 +13,7 @@ describe 'star_comments' do
       end
 
       it 'only detects a single problem' do
-        expect(problems).to have(1).problem
+        expect(problems.size).to eq(1)
       end
 
       it 'creates a warning' do
@@ -49,7 +49,7 @@ describe 'star_comments' do
       end
 
       it 'only detects a single problem' do
-        expect(problems).to have(1).problem
+        expect(problems.size).to eq(1)
       end
 
       it 'creates a warning' do
@@ -76,7 +76,7 @@ describe 'star_comments' do
       end
 
       it 'only detects a single problem' do
-        expect(problems).to have(1).problem
+        expect(problems.size).to eq(1)
       end
 
       it 'creates a warning' do
@@ -109,7 +109,7 @@ describe 'star_comments' do
       end
 
       it 'only detects a single problem' do
-        expect(problems).to have(1).problem
+        expect(problems.size).to eq(1)
       end
 
       it 'creates a warning' do