puppet-lint 2.3.0 → 2.3.1

data/spec/puppet-lint/plugins/check_resources/file_mode_spec.rb

@@ -141,26 +141,28 @@ describe 'file_mode' do
     end
 
     context 'multi body file bad modes selector' do
-      let(:code) { "
-        file {
-          '/tmp/foo1':
-            ensure => $foo ? { default => absent },
-            mode => 644;
-          '/tmp/foo2':
-            mode => 644;
-          '/tmp/foo3':
-            mode => 644;
-         }"
-      }
+      let(:code) do
+        <<-END
+          file {
+            '/tmp/foo1':
+              ensure => $foo ? { default => absent },
+              mode => 644;
+            '/tmp/foo2':
+              mode => 644;
+            '/tmp/foo3':
+              mode => 644;
+          }
+        END
+      end
 
       it 'should detect 3 problems' do
         expect(problems).to have(3).problems
       end
 
       it 'should create three warnings' do
-        expect(problems).to contain_warning(sprintf(msg)).on_line(5).in_column(21)
-        expect(problems).to contain_warning(sprintf(msg)).on_line(7).in_column(21)
-        expect(problems).to contain_warning(sprintf(msg)).on_line(9).in_column(21)
+        expect(problems).to contain_warning(sprintf(msg)).on_line(4).in_column(23)
+        expect(problems).to contain_warning(sprintf(msg)).on_line(6).in_column(23)
+        expect(problems).to contain_warning(sprintf(msg)).on_line(8).in_column(23)
       end
     end
   end
@@ -251,38 +253,42 @@ describe 'file_mode' do
     end
 
     context 'multi body file bad modes selector' do
-      let(:code) { "
-        file {
-          '/tmp/foo1':
-            ensure => $foo ? { default => absent },
-            mode => 644;
-          '/tmp/foo2':
-            mode => 644;
-          '/tmp/foo3':
-            mode => 644;
-         }"
-      }
-
-      let(:fixed) { "
-        file {
-          '/tmp/foo1':
-            ensure => $foo ? { default => absent },
-            mode => '0644';
-          '/tmp/foo2':
-            mode => '0644';
-          '/tmp/foo3':
-            mode => '0644';
-         }"
-      }
+      let(:code) do
+        <<-END
+          file {
+            '/tmp/foo1':
+              ensure => $foo ? { default => absent },
+              mode => 644;
+            '/tmp/foo2':
+              mode => 644;
+            '/tmp/foo3':
+              mode => 644;
+          }
+        END
+      end
+
+      let(:fixed) do
+        <<-END
+          file {
+            '/tmp/foo1':
+              ensure => $foo ? { default => absent },
+              mode => '0644';
+            '/tmp/foo2':
+              mode => '0644';
+            '/tmp/foo3':
+              mode => '0644';
+          }
+        END
+      end
 
       it 'should detect 3 problems' do
         expect(problems).to have(3).problems
       end
 
       it 'should fix 3 problems' do
-        expect(problems).to contain_fixed(msg).on_line(5).in_column(21)
-        expect(problems).to contain_fixed(msg).on_line(7).in_column(21)
-        expect(problems).to contain_fixed(msg).on_line(9).in_column(21)
+        expect(problems).to contain_fixed(msg).on_line(4).in_column(23)
+        expect(problems).to contain_fixed(msg).on_line(6).in_column(23)
+        expect(problems).to contain_fixed(msg).on_line(8).in_column(23)
       end
 
       it 'should zero pad the file modes and change them to strings' do

data/spec/puppet-lint/plugins/check_resources/unquoted_file_mode_spec.rb

@@ -37,26 +37,28 @@ describe 'unquoted_file_mode' do
     end
 
     context 'multi body file bad modes selector' do
-      let(:code) { "
-        file {
-          '/tmp/foo1':
-            ensure => $foo ? { default => absent },
-            mode => 644;
-          '/tmp/foo2':
-            mode => 644;
-          '/tmp/foo3':
-            mode => 644;
-         }"
-      }
+      let(:code) do
+        <<-END
+          file {
+            '/tmp/foo1':
+              ensure => $foo ? { default => absent },
+              mode => 644;
+            '/tmp/foo2':
+              mode => 644;
+            '/tmp/foo3':
+              mode => 644;
+          }
+        END
+      end
 
       it 'should detect 3 problems' do
         expect(problems).to have(3).problems
       end
 
       it 'should create three warnings' do
-        expect(problems).to contain_warning(sprintf(msg)).on_line(5).in_column(21)
-        expect(problems).to contain_warning(sprintf(msg)).on_line(7).in_column(21)
-        expect(problems).to contain_warning(sprintf(msg)).on_line(9).in_column(21)
+        expect(problems).to contain_warning(sprintf(msg)).on_line(4).in_column(23)
+        expect(problems).to contain_warning(sprintf(msg)).on_line(6).in_column(23)
+        expect(problems).to contain_warning(sprintf(msg)).on_line(8).in_column(23)
       end
     end
   end
@@ -115,38 +117,42 @@ describe 'unquoted_file_mode' do
     end
 
     context 'multi body file bad modes selector' do
-      let(:code) { "
-        file {
-          '/tmp/foo1':
-            ensure => $foo ? { default => absent },
-            mode => 644;
-          '/tmp/foo2':
-            mode => 644;
-          '/tmp/foo3':
-            mode => 644;
-         }"
-      }
-
-      let(:fixed) { "
-        file {
-          '/tmp/foo1':
-            ensure => $foo ? { default => absent },
-            mode => '644';
-          '/tmp/foo2':
-            mode => '644';
-          '/tmp/foo3':
-            mode => '644';
-         }"
-      }
+      let(:code) do
+        <<-END
+          file {
+            '/tmp/foo1':
+              ensure => $foo ? { default => absent },
+              mode => 644;
+            '/tmp/foo2':
+              mode => 644;
+            '/tmp/foo3':
+              mode => 644;
+          }
+        END
+      end
+
+      let(:fixed) do
+        <<-END
+          file {
+            '/tmp/foo1':
+              ensure => $foo ? { default => absent },
+              mode => '644';
+            '/tmp/foo2':
+              mode => '644';
+            '/tmp/foo3':
+              mode => '644';
+          }
+        END
+      end
 
       it 'should detect 3 problems' do
         expect(problems).to have(3).problems
       end
 
       it 'should fix 3 problems' do
-        expect(problems).to contain_fixed(msg).on_line(5).in_column(21)
-        expect(problems).to contain_fixed(msg).on_line(7).in_column(21)
-        expect(problems).to contain_fixed(msg).on_line(9).in_column(21)
+        expect(problems).to contain_fixed(msg).on_line(4).in_column(23)
+        expect(problems).to contain_fixed(msg).on_line(6).in_column(23)
+        expect(problems).to contain_fixed(msg).on_line(8).in_column(23)
       end
 
       it 'should quote the file modes' do

data/spec/puppet-lint/plugins/check_resources/unquoted_resource_title_spec.rb

@@ -13,7 +13,7 @@ describe 'unquoted_resource_title' do
     end
 
     context 'unquoted resource title on single line resource' do
-      let(:code) { "file { foo: }" }
+      let(:code) { 'file { foo: }' }
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem
@@ -25,10 +25,12 @@ describe 'unquoted_resource_title' do
     end
 
     context 'quoted resource title on multi line resource' do
-      let(:code) { "
-        file { 'foo':
-        }"
-      }
+      let(:code) do
+        <<-END
+          file { 'foo':
+          }
+        END
+      end
 
       it 'should not detect any problems' do
         expect(problems).to have(0).problems
@@ -36,27 +38,31 @@ describe 'unquoted_resource_title' do
     end
 
     context 'unquoted resource title on multi line resource' do
-      let(:code) { "
-        file { foo:
-        }"
-      }
+      let(:code) do
+        <<-END
+          file { foo:
+          }
+        END
+      end
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem
       end
 
       it 'should create a warning' do
-        expect(problems).to contain_warning(msg).on_line(2).in_column(16)
+        expect(problems).to contain_warning(msg).on_line(1).in_column(18)
       end
     end
 
     context 'condensed resources with quoted titles' do
-      let(:code) { "
-        file {
-          'foo': ;
-          'bar': ;
-        }"
-      }
+      let(:code) do
+        <<-END
+          file {
+            'foo': ;
+            'bar': ;
+          }
+        END
+      end
 
       it 'should not detect any problems' do
         expect(problems).to have(0).problems
@@ -64,19 +70,21 @@ describe 'unquoted_resource_title' do
     end
 
     context 'condensed resources with an unquoted title' do
-      let(:code) { "
-        file {
-          'foo': ;
-          bar: ;
-        }"
-      }
+      let(:code) do
+        <<-END
+          file {
+            'foo': ;
+            bar: ;
+          }
+        END
+      end
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem
       end
 
       it 'should create a warning' do
-        expect(problems).to contain_warning(msg).on_line(4).in_column(11)
+        expect(problems).to contain_warning(msg).on_line(3).in_column(13)
       end
     end
 
@@ -89,15 +97,17 @@ describe 'unquoted_resource_title' do
     end
 
     context 'resource inside a case statement' do
-      let(:code) { "
-        case $ensure {
-          'absent': {
-            file { \"some_file_${name}\":
-              ensure => absent,
+      let(:code) do
+        <<-END
+          case $ensure {
+            'absent': {
+              file { "some_file_${name}":
+                ensure => absent,
+              }
             }
           }
-        }"
-      }
+        END
+      end
 
       it 'should not detect any problems' do
         expect(problems).to have(0).problems
@@ -105,12 +115,14 @@ describe 'unquoted_resource_title' do
     end
 
     context 'issue #116' do
-      let(:code) { "
-        $config_file_init = $::operatingsystem ? {
-          /(?i:Debian|Ubuntu|Mint)/ => '/etc/default/foo',
-          default                   => '/etc/sysconfig/foo',
-        }"
-      }
+      let(:code) do
+        <<-END
+          $config_file_init = $::operatingsystem ? {
+            /(?i:Debian|Ubuntu|Mint)/ => '/etc/default/foo',
+            default                   => '/etc/sysconfig/foo',
+          }
+        END
+      end
 
       it 'should not detect any problems' do
         expect(problems).to have(0).problems
@@ -118,19 +130,21 @@ describe 'unquoted_resource_title' do
     end
 
     context 'case statement' do
-      let(:code) { %{
-        case $operatingsystem {
-          centos: {
-            $version = '1.2.3'
-          }
-          solaris: {
-            $version = '3.2.1'
-          }
-          default: {
-            fail("Module ${module_name} is not supported on ${operatingsystem}")
+      let(:code) do
+        <<-END
+          case $operatingsystem {
+            centos: {
+              $version = '1.2.3'
+            }
+            solaris: {
+              $version = '3.2.1'
+            }
+            default: {
+              fail("Module ${module_name} is not supported on ${operatingsystem}")
+            }
           }
-        }}
-      }
+        END
+      end
 
       it 'should not detect any problems' do
         expect(problems).to have(0).problems
@@ -148,7 +162,7 @@ describe 'unquoted_resource_title' do
     end
 
     context 'unquoted resource title on single line resource' do
-      let(:code) { "file { foo: }" }
+      let(:code) { 'file { foo: }' }
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem
@@ -164,21 +178,26 @@ describe 'unquoted_resource_title' do
     end
 
     context 'unquoted resource title on multi line resource' do
-      let(:code) { "
-        file { foo:
-        }"
-      }
-      let(:fixed) { "
-        file { 'foo':
-        }"
-      }
+      let(:code) do
+        <<-END
+          file { foo:
+          }
+        END
+      end
+
+      let(:fixed) do
+        <<-END
+          file { 'foo':
+          }
+        END
+      end
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem
       end
 
       it 'should fix the manifest' do
-        expect(problems).to contain_fixed(msg).on_line(2).in_column(16)
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(18)
       end
 
       it 'should single quote the resource title' do
@@ -187,25 +206,30 @@ describe 'unquoted_resource_title' do
     end
 
     context 'condensed resources with an unquoted title' do
-      let(:code) { "
-        file {
-          'foo': ;
-          bar: ;
-        }"
-      }
-      let(:fixed) { "
-        file {
-          'foo': ;
-          'bar': ;
-        }"
-      }
+      let(:code) do
+        <<-END
+          file {
+            'foo': ;
+            bar: ;
+          }
+        END
+      end
+
+      let(:fixed) do
+        <<-END
+          file {
+            'foo': ;
+            'bar': ;
+          }
+        END
+      end
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem
       end
 
       it 'should fix the manifest' do
-        expect(problems).to contain_fixed(msg).on_line(4).in_column(11)
+        expect(problems).to contain_fixed(msg).on_line(3).in_column(13)
       end
 
       it 'should single quote the resource title' do