Merge branch 'refactor/master/8665_whole_line'

* refactor/master/8665_whole_line:
  (#8665) Change type from append_line to whole_line

3 files changed, 26 insertions, 26 deletions

diff --git a/spec/unit/puppet/provider/append_line/ruby_spec.rb b/spec/unit/puppet/provider/whole_line/ruby_spec.rb
index ea28c31..9faff2c 100644
--- a/spec/unit/puppet/provider/append_line/ruby_spec.rb
+++ b/spec/unit/puppet/provider/whole_line/ruby_spec.rb
@@ -1,12 +1,12 @@
 require 'puppet'
 require 'tempfile'
-provider_class = Puppet::Type.type(:append_line).provider(:ruby)
+provider_class = Puppet::Type.type(:whole_line).provider(:ruby)
 describe provider_class do
   before :each do
     tmp = Tempfile.new('tmp')
     @tmpfile = tmp.path
     tmp.close!
-    @resource = Puppet::Type::Append_line.new(
+    @resource = Puppet::Type::Whole_line.new(
       {:name => 'foo', :path => @tmpfile, :line => 'foo'}
     )
     @provider = provider_class.new(@resource)
diff --git a/spec/unit/puppet/type/append_line_spec.rb b/spec/unit/puppet/type/append_line_spec.rb
deleted file mode 100644
index d0564c3..0000000
--- a/spec/unit/puppet/type/append_line_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'puppet'
-require 'tempfile'
-describe Puppet::Type.type(:append_line) do
-  before :each do
-    @append_line = Puppet::Type.type(:append_line).new(:name => 'foo', :line => 'line', :path => '/tmp/path')
-  end
-  it 'should accept a line and path' do
-    @append_line[:line] = 'my_line'
-    @append_line[:line].should == 'my_line'
-  end
-  it 'should accept posix filenames' do
-    @append_line[:path] = '/tmp/path'
-    @append_line[:path].should == '/tmp/path'
-  end
-  it 'should not accept unqualified path' do
-    expect { @append_line[:path] = 'file' }.should raise_error(Puppet::Error, /File paths must be fully qualified/)
-  end
-  it 'should require that a line is specified' do
-    expect { Puppet::Type.type(:append_line).new(:name => 'foo', :path => '/tmp/file') }.should raise_error(Puppet::Error, /Both line and path are required attributes/)
-  end
-  it 'should require that a file is specified' do
-    expect { Puppet::Type.type(:append_line).new(:name => 'foo', :line => 'path') }.should raise_error(Puppet::Error, /Both line and path are required attributes/)
-  end
-end
diff --git a/spec/unit/puppet/type/whole_line_spec.rb b/spec/unit/puppet/type/whole_line_spec.rb
new file mode 100644
index 0000000..f273baa
--- /dev/null
+++ b/spec/unit/puppet/type/whole_line_spec.rb
@@ -0,0 +1,24 @@
+require 'puppet'
+require 'tempfile'
+describe Puppet::Type.type(:whole_line) do
+  before :each do
+    @whole_line = Puppet::Type.type(:whole_line).new(:name => 'foo', :line => 'line', :path => '/tmp/path')
+  end
+  it 'should accept a line and path' do
+    @whole_line[:line] = 'my_line'
+    @whole_line[:line].should == 'my_line'
+  end
+  it 'should accept posix filenames' do
+    @whole_line[:path] = '/tmp/path'
+    @whole_line[:path].should == '/tmp/path'
+  end
+  it 'should not accept unqualified path' do
+    expect { @whole_line[:path] = 'file' }.should raise_error(Puppet::Error, /File paths must be fully qualified/)
+  end
+  it 'should require that a line is specified' do
+    expect { Puppet::Type.type(:whole_line).new(:name => 'foo', :path => '/tmp/file') }.should raise_error(Puppet::Error, /Both line and path are required attributes/)
+  end
+  it 'should require that a file is specified' do
+    expect { Puppet::Type.type(:whole_line).new(:name => 'foo', :line => 'path') }.should raise_error(Puppet::Error, /Both line and path are required attributes/)
+  end
+end