puppet-lint 2.3.0 → 2.3.1

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

@@ -5,7 +5,7 @@ describe 'slash_comments' do
 
   context 'with fix disabled' do
     context 'slash comments' do
-      let(:code) { "// foo" }
+      let(:code) { '// foo' }
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem
@@ -38,7 +38,7 @@ describe 'slash_comments' do
       end
 
       it 'should replace the double slash with a hash' do
-        expect(manifest).to eq("# foo")
+        expect(manifest).to eq('# foo')
       end
     end
   end

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

@@ -5,17 +5,19 @@ describe 'star_comments' do
 
   context 'with fix disabled' do
     context 'multiline comment w/ one line of content' do
-      let(:code) { "
-        /* foo
-        */
-      "}
+      let(:code) do
+        <<-END
+          /* 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(9)
+        expect(problems).to contain_warning(msg).on_line(1).in_column(11)
       end
     end
   end
@@ -30,13 +32,21 @@ describe 'star_comments' do
     end
 
     context 'multiline comment w/ no indents' do
-      let(:code) { "/* foo *
- *     *
- * bar */"}
+      let(:code) do
+        <<-END.gsub(%r{^ {10}}, '')
+          /* foo *
+           *     *
+           * bar */
+        END
+      end
 
-      let(:fixed) { "# foo *
-# *
-# bar"}
+      let(:fixed) do
+        <<-END.gsub(%r{^ {10}}, '')
+          # foo *
+          # *
+          # bar
+        END
+      end
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem
@@ -50,23 +60,27 @@ describe 'star_comments' do
         expect(manifest).to eq(fixed)
       end
     end
- 
+
     context 'multiline comment w/ one line of content' do
-      let(:code) { "
-        /* foo
-        */
-      "}
+      let(:code) do
+        <<-END
+          /* foo
+          */
+        END
+      end
 
-      let(:fixed) { "
-        # foo
-      "}
+      let(:fixed) do
+        <<-END
+          # 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_fixed(msg).on_line(2).in_column(9)
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(11)
       end
 
       it 'should convert the multiline comment' do
@@ -75,27 +89,31 @@ describe 'star_comments' do
     end
 
     context 'multiline comment w/ multiple line of content' do
-      let(:code) { "
-        /* foo
-         * bar
-         * baz
-         */
-        notify { 'foo': }
-      "}
-
-      let(:fixed) { "
-        # foo
-        # bar
-        # baz
-        notify { 'foo': }
-      "}
+      let(:code) do
+        <<-END
+          /* foo
+           * bar
+           * baz
+           */
+          notify { 'foo': }
+        END
+      end
+
+      let(:fixed) do
+        <<-END
+          # foo
+          # bar
+          # baz
+          notify { '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_fixed(msg).on_line(2).in_column(9)
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(11)
       end
 
       it 'should convert the multiline comment' do

data/spec/puppet-lint/plugins/check_conditionals/case_without_default_spec.rb

@@ -4,12 +4,14 @@ describe 'case_without_default' do
   let(:msg) { 'case statement without a default case' }
 
   context 'case statement with a default case' do
-    let(:code) { "
-      case $foo {
-        bar: { }
-        default: { }
-      }"
-    }
+    let(:code) do
+      <<-END
+        case $foo {
+          bar: { }
+          default: { }
+        }
+      END
+    end
 
     it 'should not detect any problems' do
       expect(problems).to have(0).problems
@@ -17,31 +19,35 @@ describe 'case_without_default' do
   end
 
   context 'case statement without a default case' do
-    let(:code) { "
-      case $foo {
-        bar: { }
-        baz: { }
-      }"
-    }
+    let(:code) do
+      <<-END
+        case $foo {
+          bar: { }
+          baz: { }
+        }
+      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(7)
+      expect(problems).to contain_warning(msg).on_line(1).in_column(9)
     end
   end
-  
+
   context 'nested case statements without a default case on the outermost' do
-    let(:code) { "
-      case $foo {
-        case $foop {
-	  bar: {}
-	  default: {}
-	}
-      }"
-    }
+    let(:code) do
+      <<-END
+        case $foo {
+          case $foop {
+            bar: {}
+            default: {}
+          }
+        }
+      END
+    end
 
     it 'should only detect a single problem' do
       expect(problems).to have(1).problem
@@ -53,43 +59,47 @@ describe 'case_without_default' do
   end
 
   context 'three nested case statements with two missing default cases' do
-    let(:code) { "
-      case $foo {
-        case $foop {
-	  bar: {}
-	  case $woop {
-	    baz: {}
-	  }
-	  default: {}
-	}
-      }"
-    }
+    let(:code) do
+      <<-END
+        case $foo {
+          case $foop {
+            bar: {}
+            case $woop {
+              baz: {}
+            }
+            default: {}
+          }
+        }
+      END
+    end
 
     it 'should detect two problems' do
       expect(problems).to have(2).problems
     end
 
     it 'should create two warnings' do
-      expect(problems).to contain_warning(msg).on_line(2).in_column(7)
-      expect(problems).to contain_warning(msg).on_line(5).in_column(4)
+      expect(problems).to contain_warning(msg).on_line(1).in_column(9)
+      expect(problems).to contain_warning(msg).on_line(4).in_column(13)
     end
   end
 
   context 'issue-117' do
-    let(:code) { "
-      $mem = inline_template('<%
-        mem,unit = scope.lookupvar(\'::memorysize\').split
-        mem = mem.to_f
-        # Normalize mem to bytes
-        case unit
-            when nil:  mem *= (1<<0)
-            when \'kB\': mem *= (1<<10)
-            when \'MB\': mem *= (1<<20)
-            when \'GB\': mem *= (1<<30)
-            when \'TB\': mem *= (1<<40)
-        end
-        %><%= mem.to_i %>')
-    "}
+    let(:code) do
+      <<-END
+        $mem = inline_template('<%
+          mem,unit = scope.lookupvar(\'::memorysize\').split
+          mem = mem.to_f
+          # Normalize mem to bytes
+          case unit
+              when nil:  mem *= (1<<0)
+              when \'kB\': mem *= (1<<10)
+              when \'MB\': mem *= (1<<20)
+              when \'GB\': mem *= (1<<30)
+              when \'TB\': mem *= (1<<40)
+          end
+          %><%= mem.to_i %>')
+      END
+    end
 
     it 'should not detect any problems' do
       expect(problems).to have(0).problems

data/spec/puppet-lint/plugins/check_conditionals/selector_inside_resource_spec.rb

@@ -4,30 +4,34 @@ describe 'selector_inside_resource' do
   let(:msg) { 'selector inside resource block' }
 
   context 'resource with a selector' do
-    let(:code) { "
-      file { 'foo':
-        ensure => $bar ? {
-          true    => present,
-          default => absent,
-        },
-      }"
-    }
+    let(:code) do
+      <<-END
+        file { 'foo':
+          ensure => $bar ? {
+            true    => present,
+            default => absent,
+          },
+        }
+      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(3).in_column(16)
+      expect(problems).to contain_warning(msg).on_line(2).in_column(18)
     end
   end
 
   context 'resource with a variable as a attr value' do
-    let(:code) { "
-      file { 'foo',
-        ensure => $bar,
-      }"
-    }
+    let(:code) do
+      <<-END
+        file { 'foo',
+          ensure => $bar,
+        }
+      END
+    end
 
     it 'should not detect any problems' do
       expect(problems).to have(0).problems

data/spec/puppet-lint/plugins/check_documentation/documentation_spec.rb

@@ -5,7 +5,7 @@ describe 'documentation' do
   let(:define_msg) { 'defined type not documented' }
 
   describe 'undocumented class' do
-    let(:code) { "class test {}" }
+    let(:code) { 'class test {}' }
 
     it 'should only detect a single problem' do
       expect(problems).to have(1).problem
@@ -17,10 +17,12 @@ describe 'documentation' do
   end
 
   describe 'documented class' do
-    let(:code) { "
-      # foo
-      class test {}
-    "}
+    let(:code) do
+      <<-END
+        # foo
+        class test {}
+      END
+    end
 
     it 'should not detect any problems' do
       expect(problems).to have(0).problems
@@ -28,7 +30,7 @@ describe 'documentation' do
   end
 
   describe 'undocumented defined type' do
-    let(:code) { "define test {}" }
+    let(:code) { 'define test {}' }
 
     it 'should only detect a single problem' do
       expect(problems).to have(1).problem
@@ -40,10 +42,12 @@ describe 'documentation' do
   end
 
   describe 'documented defined type' do
-    let(:code) { "
-      # foo
-      define test {}
-    "}
+    let(:code) do
+      <<-END
+        # foo
+        define test {}
+      END
+    end
 
     it 'should not detect any problems' do
       expect(problems).to have(0).problems

data/spec/puppet-lint/plugins/check_nodes/unquoted_node_name_spec.rb

@@ -5,7 +5,7 @@ describe 'unquoted_node_name' do
 
   context 'with fix disabled' do
     context 'unquoted node name' do
-      let(:code) { "node foo { }" }
+      let(:code) { 'node foo { }' }
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem
@@ -17,7 +17,7 @@ describe 'unquoted_node_name' do
     end
 
     context 'default node' do
-      let(:code) { "node default { }" }
+      let(:code) { 'node default { }' }
 
       it 'should not detect any problems' do
         expect(problems).to have(0).problems
@@ -33,7 +33,7 @@ describe 'unquoted_node_name' do
     end
 
     context 'regex node name' do
-      let(:code) { "node /foo/ { }" }
+      let(:code) { 'node /foo/ { }' }
 
       it 'should not detect any problems' do
         expect(problems).to have(0).problems
@@ -41,7 +41,7 @@ describe 'unquoted_node_name' do
     end
 
     context 'multiple bare node names' do
-      let(:code) { "node foo, bar, baz { }" }
+      let(:code) { 'node foo, bar, baz { }' }
 
       it 'should detect 3 problems' do
         expect(problems).to have(3).problems
@@ -68,7 +68,7 @@ describe 'unquoted_node_name' do
     end
 
     context 'multiple node blocks' do
-      let(:code) { "node foo { } node bar { }" }
+      let(:code) { 'node foo { } node bar { }' }
 
       it 'should detect 2 problems' do
         expect(problems).to have(2).problems
@@ -103,7 +103,7 @@ describe 'unquoted_node_name' do
     end
 
     context 'unquoted node name' do
-      let(:code) { "node foo { }" }
+      let(:code) { 'node foo { }' }
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem
@@ -119,7 +119,7 @@ describe 'unquoted_node_name' do
     end
 
     context 'multiple bare node names' do
-      let(:code) { "node foo, bar, baz { }" }
+      let(:code) { 'node foo, bar, baz { }' }
       let(:fixed) { "node 'foo', 'bar', 'baz' { }" }
 
       it 'should detect 3 problems' do