puppet-lint 2.5.0 → 3.0.0

data/spec/{puppet-lint → unit/puppet-lint}/plugins/check_resources/unquoted_file_mode_spec.rb

@@ -7,11 +7,11 @@ describe 'unquoted_file_mode' do
     context '4 digit unquoted file mode' do
       let(:code) { "file { 'foo': mode => 0777 }" }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(23)
       end
     end
@@ -19,11 +19,11 @@ describe 'unquoted_file_mode' do
     context '4 digit unquoted file mode' do
       let(:code) { "concat { 'foo': mode => 0777 }" }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(25)
       end
     end
@@ -31,7 +31,7 @@ describe 'unquoted_file_mode' do
     context 'file mode from a function rvalue' do
       let(:code) { "file { 'foo': mode => lookup('bar'), }" }
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -51,11 +51,11 @@ describe 'unquoted_file_mode' do
         END
       end
 
-      it 'should detect 3 problems' do
+      it 'detects 3 problems' do
         expect(problems).to have(3).problems
       end
 
-      it 'should create three warnings' do
+      it 'creates three warnings' do
         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)
@@ -64,26 +64,26 @@ describe 'unquoted_file_mode' do
   end
 
   context 'with fix enabled' do
-    before do
+    before(:each) do
       PuppetLint.configuration.fix = true
     end
 
-    after do
+    after(:each) do
       PuppetLint.configuration.fix = false
     end
 
     context '4 digit unquoted file mode w/fix' do
       let(:code) { "file { 'foo': mode => 0777 }" }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the manifest' do
+      it 'fixes the manifest' do
         expect(problems).to contain_fixed(msg).on_line(1).in_column(23)
       end
 
-      it 'should single quote the file mode' do
+      it 'single quotes the file mode' do
         expect(manifest).to eq("file { 'foo': mode => '0777' }")
       end
     end
@@ -91,15 +91,15 @@ describe 'unquoted_file_mode' do
     context '4 digit unquoted file mode w/fix' do
       let(:code) { "concat { 'foo': mode => 0777 }" }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the manifest' do
+      it 'fixes the manifest' do
         expect(problems).to contain_fixed(msg).on_line(1).in_column(25)
       end
 
-      it 'should single quote the file mode' do
+      it 'single quotes the file mode' do
         expect(manifest).to eq("concat { 'foo': mode => '0777' }")
       end
     end
@@ -107,11 +107,11 @@ describe 'unquoted_file_mode' do
     context 'file mode from a function rvalue' do
       let(:code) { "file { 'foo': mode => lookup('bar'), }" }
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
 
-      it 'should not change the manifest' do
+      it 'does not change the manifest' do
         expect(manifest).to eq(code)
       end
     end
@@ -145,17 +145,17 @@ describe 'unquoted_file_mode' do
         END
       end
 
-      it 'should detect 3 problems' do
+      it 'detects 3 problems' do
         expect(problems).to have(3).problems
       end
 
-      it 'should fix 3 problems' do
+      it 'fixes 3 problems' do
         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
+      it 'quotes the file modes' do
         expect(manifest).to eq(fixed)
       end
     end

data/spec/{puppet-lint → unit/puppet-lint}/plugins/check_resources/unquoted_resource_title_spec.rb

@@ -7,7 +7,7 @@ describe 'unquoted_resource_title' do
     context 'quoted resource title on single line resource' do
       let(:code) { "file { 'foo': }" }
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -15,11 +15,11 @@ describe 'unquoted_resource_title' do
     context 'unquoted resource title on single line resource' do
       let(:code) { 'file { foo: }' }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(8)
       end
     end
@@ -32,7 +32,7 @@ describe 'unquoted_resource_title' do
         END
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -45,11 +45,11 @@ describe 'unquoted_resource_title' do
         END
       end
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(18)
       end
     end
@@ -64,7 +64,7 @@ describe 'unquoted_resource_title' do
         END
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -79,11 +79,11 @@ describe 'unquoted_resource_title' do
         END
       end
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(3).in_column(13)
       end
     end
@@ -91,7 +91,7 @@ describe 'unquoted_resource_title' do
     context 'single line resource with an array of titles (all quoted)' do
       let(:code) { "file { ['foo', 'bar']: }" }
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -109,7 +109,7 @@ describe 'unquoted_resource_title' do
         END
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -124,7 +124,7 @@ describe 'unquoted_resource_title' do
         END
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -146,33 +146,33 @@ describe 'unquoted_resource_title' do
         END
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
   end
 
   context 'with fix enabled' do
-    before do
+    before(:each) do
       PuppetLint.configuration.fix = true
     end
 
-    after do
+    after(:each) do
       PuppetLint.configuration.fix = false
     end
 
     context 'unquoted resource title on single line resource' do
       let(:code) { 'file { foo: }' }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the manifest' do
+      it 'fixes the manifest' do
         expect(problems).to contain_fixed(msg).on_line(1).in_column(8)
       end
 
-      it 'should single quote the resource title' do
+      it 'singles quote the resource title' do
         expect(manifest).to eq("file { 'foo': }")
       end
     end
@@ -192,15 +192,15 @@ describe 'unquoted_resource_title' do
         END
       end
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the manifest' do
+      it 'fixes the manifest' do
         expect(problems).to contain_fixed(msg).on_line(1).in_column(18)
       end
 
-      it 'should single quote the resource title' do
+      it 'singles quote the resource title' do
         expect(manifest).to eq(fixed)
       end
     end
@@ -224,15 +224,15 @@ describe 'unquoted_resource_title' do
         END
       end
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the manifest' do
+      it 'fixes the manifest' do
         expect(problems).to contain_fixed(msg).on_line(3).in_column(13)
       end
 
-      it 'should single quote the resource title' do
+      it 'singles quote the resource title' do
         expect(manifest).to eq(fixed)
       end
     end

data/spec/{puppet-lint → unit/puppet-lint}/plugins/check_strings/double_quoted_strings_spec.rb

@@ -7,7 +7,7 @@ describe 'double_quoted_strings' do
     context 'double quoted string containing a variable inside single quotes' do
       let(:code) { "exec { \"/usr/bin/wget -O - '${source}' | /usr/bin/apt-key add -\": }" }
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -15,11 +15,11 @@ describe 'double_quoted_strings' do
     context 'multiple strings in a line' do
       let(:code) { "\"aoeu\" '${foo}'" }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(1)
       end
     end
@@ -27,7 +27,7 @@ describe 'double_quoted_strings' do
     context 'double quoted string nested in a single quoted string' do
       let(:code) { "'grep \"status=sent\" /var/log/mail.log'" }
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -35,7 +35,7 @@ describe 'double_quoted_strings' do
     context 'double quoted string after a comment' do
       let(:code) { "service { 'foo': } # \"bar\"" }
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -43,7 +43,7 @@ describe 'double_quoted_strings' do
     context 'double quoted string containing newline but no variables' do
       let(:code) { %("foo\n") }
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -64,7 +64,7 @@ describe 'double_quoted_strings' do
         END
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -72,11 +72,11 @@ describe 'double_quoted_strings' do
     context 'double quoted true' do
       let(:code) { "class { 'foo': boolFlag => \"true\" }" }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(28)
       end
     end
@@ -84,11 +84,11 @@ describe 'double_quoted_strings' do
     context 'double quoted false' do
       let(:code) { "class { 'foo': boolFlag => \"false\" }" }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(28)
       end
     end
@@ -103,10 +103,11 @@ describe 'double_quoted_strings' do
           $string5 = "this string contains \\'escaped \\' single quotes"
           $string6 = "this string contains \r carriage return"
           $string7 = "this string contains \\\\ an escaped backslash"
+          $string8 = "this string contains \\s"
         END
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -114,11 +115,11 @@ describe 'double_quoted_strings' do
     context 'double quoted string with random escape should be rejected' do
       let(:code) { %( $ztring = "this string contains \l random escape" ) }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(12)
       end
     end
@@ -126,7 +127,7 @@ describe 'double_quoted_strings' do
     context 'single quotes in a double quoted string' do
       let(:code) { "\"this 'string' 'has' lots of 'quotes'\"" }
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -134,29 +135,29 @@ describe 'double_quoted_strings' do
     context 'double quoted string containing single quoted string' do
       let(:code) { %(notify { "'foo'": }) }
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
   end
 
   context 'with fix enabled' do
-    before do
+    before(:each) do
       PuppetLint.configuration.fix = true
     end
 
-    after do
+    after(:each) do
       PuppetLint.configuration.fix = false
     end
 
     context 'double quoted string containing a variable inside single quotes' do
       let(:code) { "exec { \"/usr/bin/wget -O - '${source}' | /usr/bin/apt-key add -\": }" }
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
 
-      it 'should not modify the manifest' do
+      it 'does not modify the manifest' do
         expect(manifest).to eq(code)
       end
     end
@@ -164,11 +165,11 @@ describe 'double_quoted_strings' do
     context 'double quoted string containing a lone dollar' do
       let(:code) { "\"sed -i 's/^;*[[:space:]]*${name}[[:space:]]*=.*$/${name} = ${value}/g' file\"" }
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
 
-      it 'should not modify the manifest' do
+      it 'does not modify the manifest' do
         expect(manifest).to eq(code)
       end
     end
@@ -176,15 +177,15 @@ describe 'double_quoted_strings' do
     context 'multiple strings in a line' do
       let(:code) { "\"aoeu\" '${foo}'" }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the manifest' do
+      it 'fixes the manifest' do
         expect(problems).to contain_fixed(msg).on_line(1).in_column(1)
       end
 
-      it 'should convert the double quoted string into single quotes' do
+      it 'converts the double quoted string into single quotes' do
         expect(manifest).to eq("'aoeu' '${foo}'")
       end
     end
@@ -192,11 +193,11 @@ describe 'double_quoted_strings' do
     context 'single quotes in a double quoted string' do
       let(:code) { "\"this 'string' 'has' lots of 'quotes'\"" }
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
 
-      it 'should not modify the manifest' do
+      it 'does not modify the manifest' do
         expect(manifest).to eq(code)
       end
     end

data/spec/{puppet-lint → unit/puppet-lint}/plugins/check_strings/only_variable_string_spec.rb

@@ -7,11 +7,11 @@ describe 'only_variable_string' do
     context 'string containing only a variable' do
       let(:code) { '"${foo}"' }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(4)
       end
     end
@@ -19,11 +19,11 @@ describe 'only_variable_string' do
     context 'string containing only a variable w/ ref' do
       let(:code) { '"${foo[0]}"' }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(4)
       end
     end
@@ -31,11 +31,11 @@ describe 'only_variable_string' do
     context 'string containing only a variable w/ lots of refs' do
       let(:code) { '"${foo[0][aoeuaoeu][bar][999]}"' }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(4)
       end
     end
@@ -50,33 +50,33 @@ describe 'only_variable_string' do
         END
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to be_empty
       end
     end
   end
 
   context 'with fix enabled' do
-    before do
+    before(:each) do
       PuppetLint.configuration.fix = true
     end
 
-    after do
+    after(:each) do
       PuppetLint.configuration.fix = false
     end
 
     context 'string containing only a variable' do
       let(:code) { '"${foo}"' }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the manifest' do
+      it 'fixes the manifest' do
         expect(problems).to contain_fixed(msg).on_line(1).in_column(4)
       end
 
-      it 'should unquote the variable' do
+      it 'unquotes the variable' do
         expect(manifest).to eq('$foo')
       end
     end
@@ -84,15 +84,15 @@ describe 'only_variable_string' do
     context 'string contaiting only a variable w/ ref' do
       let(:code) { '"${foo[0]}"' }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the manifest' do
+      it 'fixes the manifest' do
         expect(problems).to contain_fixed(msg).on_line(1).in_column(4)
       end
 
-      it 'should unquoted the variable' do
+      it 'unquotes the variable' do
         expect(manifest).to eq('$foo[0]')
       end
     end
@@ -100,15 +100,15 @@ describe 'only_variable_string' do
     context 'string containing only a variable w/ lots of refs' do
       let(:code) { '"${foo[0][aoeuaoeu][bar][999]}"' }
 
-      it 'should only detect a single problem' do
+      it 'only detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the manifest' do
+      it 'fixes the manifest' do
         expect(problems).to contain_fixed(msg).on_line(1).in_column(4)
       end
 
-      it 'should unquote the variable' do
+      it 'unquotes the variable' do
         expect(manifest).to eq('$foo[0][aoeuaoeu][bar][999]')
       end
     end