X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Funit%2Fpuppet%2Ftype%2Ffile_line_spec.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Funit%2Fpuppet%2Ftype%2Ffile_line_spec.rb;h=627bdf0b165350a139ec6e60cb9daff5f72c89a3;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=150149b26af90f567cc4656ef93664221185261a;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb b/3rdparty/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb
old mode 100755
new mode 100644
index 150149b26..627bdf0b1
--- a/3rdparty/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb
+++ b/3rdparty/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb
@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'tempfile'
 describe Puppet::Type.type(:file_line) do
@@ -19,93 +18,92 @@ describe Puppet::Type.type(:file_line) do
   let :file_line do
     Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'line', :path => tmp_path)
   end
-  it 'should accept a line and path' do
+
+  it 'accepts a line' do
     file_line[:line] = 'my_line'
     expect(file_line[:line]).to eq('my_line')
+  end
+  it 'accepts a path' do
     file_line[:path] = my_path
     expect(file_line[:path]).to eq(my_path)
   end
-  it 'should accept a match regex' do
+  it 'accepts a match regex' do
     file_line[:match] = '^foo.*$'
     expect(file_line[:match]).to eq('^foo.*$')
   end
-  it 'should accept a match regex that does not match the specified line' do
+
+  it 'accepts a match regex that does not match the specified line' do
     expect {
       Puppet::Type.type(:file_line).new(
-          :name   => 'foo',
-          :path   => my_path,
-          :line   => 'foo=bar',
-          :match  => '^bar=blah$'
-    )}.not_to raise_error
+        :name => 'foo', :path => my_path, :line => 'foo=bar', :match => '^bar=blah$',
+      )
+    }.not_to raise_error
   end
-  it 'should accept a match regex that does match the specified line' do
+  it 'accepts a match regex that does match the specified line' do
     expect {
       Puppet::Type.type(:file_line).new(
-          :name   => 'foo',
-          :path   => my_path,
-          :line   => 'foo=bar',
-          :match  => '^\s*foo=.*$'
-      )}.not_to raise_error
+        :name => 'foo', :path => my_path, :line => 'foo=bar', :match => '^\s*foo=.*$',
+      )
+    }.not_to raise_error
   end
-  it 'should accept utf8 characters' do
+  it 'accepts utf8 characters' do
     expect {
       Puppet::Type.type(:file_line).new(
-          :name   => 'ƒồỗ',
-          :path   => my_path,
-          :line   => 'ƒồỗ=ьåя',
-          :match  => '^ьåя=βļάħ$'
-      )}.not_to raise_error
+        :name => 'ƒồỗ', :path => my_path, :line => 'ƒồỗ=ьåя', :match => '^ьåя=βļάħ$',
+      )
+    }.not_to raise_error
   end
-  it 'should accept double byte characters' do
+  it 'accepts double byte characters' do
     expect {
       Puppet::Type.type(:file_line).new(
-          :name   => 'フーバー',
-          :path   => my_path,
-          :line   => 'この=それ',
-          :match  => '^この=ああ$'
-      )}.not_to raise_error
+        :name => 'フーバー', :path => my_path, :line => 'この=それ', :match => '^この=ああ$',
+      )
+    }.not_to raise_error
   end
-  it 'should accept posix filenames' do
+  it 'accepts posix filenames' do
     file_line[:path] = tmp_path
     expect(file_line[:path]).to eq(tmp_path)
   end
-  it 'should not accept unqualified path' do
-    expect { file_line[:path] = 'file' }.to raise_error(Puppet::Error, /File paths must be fully qualified/)
+  it 'does not accept unqualified path' do
+    expect { file_line[:path] = 'file' }.to raise_error(Puppet::Error, %r{File paths must be fully qualified})
   end
-  it 'should require that a line is specified' do
-    expect { Puppet::Type.type(:file_line).new(:name => 'foo', :path => tmp_path) }.to raise_error(Puppet::Error, /line is a required attribute/)
+  it 'requires that a line is specified' do
+    expect { Puppet::Type.type(:file_line).new(:name => 'foo', :path => tmp_path) }.to raise_error(Puppet::Error, %r{line is a required attribute})
   end
-  it 'should not require that a line is specified when matching for absence' do
-    expect { Puppet::Type.type(:file_line).new(:name => 'foo', :path => tmp_path, :ensure => :absent, :match_for_absence => :true, :match => 'match') }.not_to raise_error
+  it 'does not require that a line is specified when matching for absence' do
+    expect { Puppet::Type.type(:file_line).new(:name => 'foo', :path => tmp_path, :ensure => :absent, :match_for_absence => :true, :match => 'match') }.not_to raise_error # rubocop:disable Metrics/LineLength
   end
-  it 'should require that a file is specified' do
-    expect { Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'path') }.to raise_error(Puppet::Error, /path is a required attribute/)
+  it 'although if a line is specified anyway when matching for absence it still works and the line is silently ignored' do
+    expect { Puppet::Type.type(:file_line).new(:name => 'foo', :path => tmp_path, :line => 'i_am_irrelevant', :ensure => :absent, :match_for_absence => :true, :match => 'match') }.not_to raise_error # rubocop:disable Metrics/LineLength
   end
-  it 'should default to ensure => present' do
+  it 'requires that a file is specified' do
+    expect { Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'path') }.to raise_error(Puppet::Error, %r{path is a required attribute})
+  end
+  it 'defaults to ensure => present' do
     expect(file_line[:ensure]).to eq :present
   end
-  it 'should default to replace => true' do
+  it 'defaults to replace => true' do
     expect(file_line[:replace]).to eq :true
   end
-  it 'should default to encoding => UTF-8' do
+  it 'defaults to encoding => UTF-8' do
     expect(file_line[:encoding]).to eq 'UTF-8'
   end
-  it 'should accept encoding => iso-8859-1' do
+  it 'accepts encoding => iso-8859-1' do
     expect { Puppet::Type.type(:file_line).new(:name => 'foo', :path => tmp_path, :ensure => :present, :encoding => 'iso-8859-1', :line => 'bar') }.not_to raise_error
   end
-  it "should autorequire the file it manages" do
+
+  it 'autorequires the file it manages' do
     catalog = Puppet::Resource::Catalog.new
     file = Puppet::Type.type(:file).new(:name => tmp_path)
     catalog.add_resource file
     catalog.add_resource file_line
-
     relationship = file_line.autorequire.find do |rel|
-      (rel.source.to_s == "File[#{tmp_path}]") and (rel.target.to_s == file_line.to_s)
+      (rel.source.to_s == "File[#{tmp_path}]") && (rel.target.to_s == file_line.to_s)
     end
     expect(relationship).to be_a Puppet::Relationship
   end
 
-  it "should not autorequire the file it manages if it is not managed" do
+  it 'does not autorequire the file it manages if it is not managed' do
     catalog = Puppet::Resource::Catalog.new
     catalog.add_resource file_line
     expect(file_line.autorequire).to be_empty