diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2011-08-04 19:17:48 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2011-08-04 19:17:48 -0700 |
commit | 4c93090e1aad8dfdaa39b4f304d3c87704408b13 (patch) | |
tree | d1fefe1700bc598fad79311f8c85d4767a81d090 /spec/unit/puppet | |
parent | 07d0eca31780bba76f2283ce83f944473ce8fe00 (diff) | |
download | puppet-stdlib-4c93090e1aad8dfdaa39b4f304d3c87704408b13.tar.gz puppet-stdlib-4c93090e1aad8dfdaa39b4f304d3c87704408b13.tar.bz2 |
(#8792) Rename whole_line type to file_line
Without this patch the resource whole_line would be included in the
stable stdlib module shipping in PE 1.2. Ideally the name will be
stable and unchanging in the future.
There was quite a bit of concern over whole_line being an unwise name.
file_line appears to be the most suitable name and least likely to need
another rename in the future.
Diffstat (limited to 'spec/unit/puppet')
-rw-r--r-- | spec/unit/puppet/provider/file_line/ruby_spec.rb (renamed from spec/unit/puppet/provider/whole_line/ruby_spec.rb) | 4 | ||||
-rw-r--r-- | spec/unit/puppet/type/file_line_spec.rb | 24 | ||||
-rw-r--r-- | spec/unit/puppet/type/whole_line_spec.rb | 24 |
3 files changed, 26 insertions, 26 deletions
diff --git a/spec/unit/puppet/provider/whole_line/ruby_spec.rb b/spec/unit/puppet/provider/file_line/ruby_spec.rb index 9faff2c..b03fc0e 100644 --- a/spec/unit/puppet/provider/whole_line/ruby_spec.rb +++ b/spec/unit/puppet/provider/file_line/ruby_spec.rb @@ -1,12 +1,12 @@ require 'puppet' require 'tempfile' -provider_class = Puppet::Type.type(:whole_line).provider(:ruby) +provider_class = Puppet::Type.type(:file_line).provider(:ruby) describe provider_class do before :each do tmp = Tempfile.new('tmp') @tmpfile = tmp.path tmp.close! - @resource = Puppet::Type::Whole_line.new( + @resource = Puppet::Type::File_line.new( {:name => 'foo', :path => @tmpfile, :line => 'foo'} ) @provider = provider_class.new(@resource) diff --git a/spec/unit/puppet/type/file_line_spec.rb b/spec/unit/puppet/type/file_line_spec.rb new file mode 100644 index 0000000..7e07c06 --- /dev/null +++ b/spec/unit/puppet/type/file_line_spec.rb @@ -0,0 +1,24 @@ +require 'puppet' +require 'tempfile' +describe Puppet::Type.type(:file_line) do + before :each do + @file_line = Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'line', :path => '/tmp/path') + end + it 'should accept a line and path' do + @file_line[:line] = 'my_line' + @file_line[:line].should == 'my_line' + end + it 'should accept posix filenames' do + @file_line[:path] = '/tmp/path' + @file_line[:path].should == '/tmp/path' + end + it 'should not accept unqualified path' do + expect { @file_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(:file_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(:file_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 deleted file mode 100644 index f273baa..0000000 --- a/spec/unit/puppet/type/whole_line_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -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 |