Autocorrect PDK validation warnings

This commit is contained in:
2019-05-09 23:41:09 +01:00
parent 998f1716f3
commit 939f795d37
26 changed files with 537 additions and 584 deletions

View File

@@ -1,16 +1,16 @@
describe Puppet::Type.type(:enman_repo) do
before do
before(:each) do
@provider = stub 'provider'
@provider.stubs(:name).returns(:enman)
described_class.stubs(:defaultprovider).returns(@provider)
end
it "should be an instance of Puppet::Type::Enman_repo" do
expect(described_class.new(:name => "test")).to be_an_instance_of Puppet::Type::Enman_repo
it 'is an instance of Puppet::Type::Enman_repo' do
expect(described_class.new(name: 'test')).to be_an_instance_of Puppet::Type::Enman_repo
end
describe "when validating attributes" do
params = [:name]
describe 'when validating attributes' do
params = [:name]
params.each do |param|
it "should have the #{param} param" do
@@ -19,7 +19,7 @@ describe Puppet::Type.type(:enman_repo) do
end
end
it "should have name as the namevar" do
it 'has name as the namevar' do
expect(described_class.key_attributes).to eq [:name]
end
end

View File

@@ -1,17 +1,17 @@
describe Puppet::Type.type(:entropy_keywords) do
before do
before(:each) do
@provider = stub 'provider'
@provider.stubs(:name).returns(:parsed)
@provider.stubs(:ancestors).returns([Puppet::Provider::ParsedFile])
@provider.stubs(:default_target).returns("defaulttarget")
@provider.stubs(:default_target).returns('defaulttarget')
described_class.stubs(:defaultprovider).returns(@provider)
end
it "should be an instance of Puppet::Type::Entropy_keywords" do
expect(described_class.new(:name => "test", :package => "app-admin/dummy")).to be_an_instance_of Puppet::Type::Entropy_keywords
it 'is an instance of Puppet::Type::Entropy_keywords' do
expect(described_class.new(name: 'test', package: 'app-admin/dummy')).to be_an_instance_of Puppet::Type::Entropy_keywords
end
describe "when validating attributes" do
describe 'when validating attributes' do
params = [:name]
properties = [:package, :operator, :version, :repo, :target]
@@ -26,37 +26,36 @@ describe Puppet::Type.type(:entropy_keywords) do
expect(described_class.attrtype(property)).to eq :property
end
end
end
it "should have name as the namevar" do
it 'has name as the namevar' do
expect(described_class.key_attributes).to eq [:name]
end
describe "when validating the target property" do
it "should default to the provider's default target" do
expect(described_class.new(:name => "test", :package => "app-admin/dummy").should(:target)).to eq "defaulttarget"
describe 'when validating the target property' do
it "defaults to the provider's default target" do
expect(described_class.new(name: 'test', package: 'app-admin/dummy').should(:target)).to eq 'defaulttarget'
end
end
describe "when validating required properties" do
it "should raise an error when a version is passed with no package" do
describe 'when validating required properties' do
it 'raises an error when a version is passed with no package' do
expect {
described_class.new(:name => "test", :repo => "test", :version => "1.2.3")
}.to raise_error(Puppet::Error, /Package is required/)
described_class.new(name: 'test', repo: 'test', version: '1.2.3')
}.to raise_error(Puppet::Error, %r{Package is required})
end
it "should raise an error when an operator is passed with no version" do
it 'raises an error when an operator is passed with no version' do
expect {
described_class.new(:name => "test", :package => "app-admin/dummy", :operator => "<=")
}.to raise_error(Puppet::Error, /Version is required/)
described_class.new(name: 'test', package: 'app-admin/dummy', operator: '<=')
}.to raise_error(Puppet::Error, %r{Version is required})
end
end
describe "when the catalog includes a matching package" do
it "should have an autobefore relationship" do
resource = described_class.new(:name => "test", :package => "app-admin/dummy")
package = Puppet::Type.type(:package).new(:title => 'app-admin/dummy')
describe 'when the catalog includes a matching package' do
it 'has an autobefore relationship' do
resource = described_class.new(name: 'test', package: 'app-admin/dummy')
package = Puppet::Type.type(:package).new(title: 'app-admin/dummy')
catalog = Puppet::Resource::Catalog.new
catalog.add_resource package

View File

@@ -1,15 +1,15 @@
describe Puppet::Type.type(:entropy_repo) do
before do
before(:each) do
@provider = stub 'provider'
@provider.stubs(:name).returns(:file)
described_class.stubs(:defaultprovider).returns(@provider)
end
it "should be an instance of Puppet::Type::Entropy_repo" do
expect(described_class.new(:name => "test")).to be_an_instance_of Puppet::Type::Entropy_repo
it 'is an instance of Puppet::Type::Entropy_repo' do
expect(described_class.new(name: 'test')).to be_an_instance_of Puppet::Type::Entropy_repo
end
describe "when validating attributes" do
describe 'when validating attributes' do
params = [:name]
properties = [:repo_type, :enabled]
@@ -26,7 +26,7 @@ describe Puppet::Type.type(:entropy_repo) do
end
end
it "should have name as the namevar" do
it 'has name as the namevar' do
expect(described_class.key_attributes).to eq [:name]
end
end

View File

@@ -5,27 +5,27 @@ require 'puppet/type/entropy_splitdebug'
require 'puppet/type/entropy_splitdebug_mask'
types = {
:entropy_mask => Puppet::Type::Entropy_mask,
:entropy_unmask => Puppet::Type::Entropy_unmask,
:entropy_splitdebug => Puppet::Type::Entropy_splitdebug,
:entropy_splitdebug_mask => Puppet::Type::Entropy_splitdebug_mask,
entropy_mask: Puppet::Type::Entropy_mask,
entropy_unmask: Puppet::Type::Entropy_unmask,
entropy_splitdebug: Puppet::Type::Entropy_splitdebug,
entropy_splitdebug_mask: Puppet::Type::Entropy_splitdebug_mask,
}
types.each do |type_name, type|
describe Puppet::Type.type(type_name) do
before do
before(:each) do
@provider = stub 'provider'
@provider.stubs(:name).returns(:parsed)
@provider.stubs(:ancestors).returns([Puppet::Provider::ParsedFile])
@provider.stubs(:default_target).returns("defaulttarget")
@provider.stubs(:default_target).returns('defaulttarget')
described_class.stubs(:defaultprovider).returns(@provider)
end
it "should be an instance of #{type.class.name}" do
expect(described_class.new(:name => "test", :package => "app-admin/dummy")).to be_an_instance_of type
expect(described_class.new(name: 'test', package: 'app-admin/dummy')).to be_an_instance_of type
end
describe "when validating attributes" do
describe 'when validating attributes' do
params = [:name]
properties = [:package, :operator, :version, :slot, :use, :tag, :repo, :target]
@@ -40,32 +40,31 @@ types.each do |type_name, type|
expect(described_class.attrtype(property)).to eq :property
end
end
end
it "should have name as the namevar" do
it 'has name as the namevar' do
expect(described_class.key_attributes).to eq [:name]
end
describe "when validating the target property" do
it "should default to the provider's default target" do
expect(described_class.new(:name => "test", :package => "app-admin/dummy").should(:target)).to eq "defaulttarget"
describe 'when validating the target property' do
it "defaults to the provider's default target" do
expect(described_class.new(name: 'test', package: 'app-admin/dummy').should(:target)).to eq 'defaulttarget'
end
end
describe "when validating required properties" do
describe 'when validating required properties' do
packages = [
'virtual/package',
'package',
'package-with-dash',
'package_with_underscores',
'category-123/package2',
'category.with.dots/package'
'category.with.dots/package',
]
packages.each do |package|
it "should accept valid package name #{package}" do
expect {
described_class.new(:name => 'test', :package => package)
described_class.new(name: 'test', package: package)
}.not_to raise_error
end
end
@@ -79,28 +78,28 @@ types.each do |type_name, type|
packages.each do |package|
it "should reject invalid package name #{package}" do
expect {
described_class.new(:name => 'test', :package => package)
described_class.new(name: 'test', package: package)
}.to raise_error(Puppet::Error)
end
end
it "should raise an error when a version is passed with no package" do
it 'raises an error when a version is passed with no package' do
expect {
described_class.new(:name => "test", :repo => "test", :version => "1.2.3")
}.to raise_error(Puppet::Error, /Package is required/)
described_class.new(name: 'test', repo: 'test', version: '1.2.3')
}.to raise_error(Puppet::Error, %r{Package is required})
end
it "should raise an error when an operator is passed with no version" do
it 'raises an error when an operator is passed with no version' do
expect {
described_class.new(:name => "test", :package => "app-admin/dummy", :operator => "<=")
}.to raise_error(Puppet::Error, /Version is required/)
described_class.new(name: 'test', package: 'app-admin/dummy', operator: '<=')
}.to raise_error(Puppet::Error, %r{Version is required})
end
end
describe "when the catalog includes a matching package" do
it "should have an autobefore relationship" do
resource = described_class.new(:name => "test", :package => "app-admin/dummy")
package = Puppet::Type.type(:package).new(:title => 'app-admin/dummy')
describe 'when the catalog includes a matching package' do
it 'has an autobefore relationship' do
resource = described_class.new(name: 'test', package: 'app-admin/dummy')
package = Puppet::Type.type(:package).new(title: 'app-admin/dummy')
catalog = Puppet::Resource::Catalog.new
catalog.add_resource package