opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

include_class is deprecated

Browse source
This commit is contained in:
Matthew Haughton 2013-12-06 12:04:39 -05:00 committed by Matthew Haughton
parent 23150bf8c2
commit db68cf39ae
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spec/classes/config_spec.rb
View file

@ -27,7 +27,7 @@ describe 'nginx::config' do
} }
end end
it { should include_class("nginx::params") } it { should contain_class("nginx::params") }
it { should contain_file("/etc/nginx").with( it { should contain_file("/etc/nginx").with(
:ensure => 'directory', :ensure => 'directory',

6
spec/classes/nginx_spec.rb
View file

@ -23,7 +23,7 @@ describe 'nginx' do
it { should contain_nginx__package } it { should contain_nginx__package }
it { should contain_nginx__config } it { should contain_nginx__config }
it { should contain_nginx__service } it { should contain_nginx__service }
it { should include_class("nginx::params") } it { should contain_class("nginx::params") }
it { should contain_nginx__resource__upstream("upstream1") } it { should contain_nginx__resource__upstream("upstream1") }
it { should contain_nginx__resource__vhost("test2.local") } it { should contain_nginx__resource__vhost("test2.local") }
it { should contain_nginx__resource__location("test2.local") } it { should contain_nginx__resource__location("test2.local") }
@ -42,7 +42,7 @@ describe 'nginx' do
it { should contain_nginx__package } it { should contain_nginx__package }
it { should contain_nginx__config } it { should contain_nginx__config }
it { should contain_nginx__service } it { should contain_nginx__service }
it { should include_class("nginx::params") } it { should contain_class("nginx::params") }
it { should contain_nginx__resource__upstream("upstream1") } it { should contain_nginx__resource__upstream("upstream1") }
it { should contain_nginx__resource__vhost("test2.local") } it { should contain_nginx__resource__vhost("test2.local") }
it { should contain_nginx__resource__location("test2.local") } it { should contain_nginx__resource__location("test2.local") }
@ -61,7 +61,7 @@ describe 'nginx' do
it { should contain_nginx__package } it { should contain_nginx__package }
it { should contain_nginx__config } it { should contain_nginx__config }
it { should contain_nginx__service } it { should contain_nginx__service }
it { should include_class("nginx::params") } it { should contain_class("nginx::params") }
it { should contain_nginx__resource__upstream("upstream1") } it { should contain_nginx__resource__upstream("upstream1") }
it { should contain_nginx__resource__vhost("test2.local") } it { should contain_nginx__resource__vhost("test2.local") }
it { should contain_nginx__resource__location("test2.local") } it { should contain_nginx__resource__location("test2.local") }

4
spec/defines/resource_location_spec.rb
View file

@ -27,8 +27,8 @@ describe 'nginx::resource::location' do
:vhost => 'vhost1', :vhost => 'vhost1',
} end } end
it { should include_class("nginx::params") } it { should contain_class("nginx::params") }
it { should include_class("nginx::config") } it { should contain_class("nginx::config") }
it { should contain_concat__fragment("vhost1-500-rspec-test").with_content(/location rspec-test/) } it { should contain_concat__fragment("vhost1-500-rspec-test").with_content(/location rspec-test/) }
it { should_not contain_file('/etc/nginx/fastcgi_params') } it { should_not contain_file('/etc/nginx/fastcgi_params') }
it { should_not contain_concat__fragment("vhost1-800-rspec-test-ssl") } it { should_not contain_concat__fragment("vhost1-800-rspec-test-ssl") }

2
spec/defines/resource_mailhost_spec.rb
View file

@ -29,7 +29,7 @@ describe 'nginx::resource::mailhost' do
describe 'basic assumptions' do describe 'basic assumptions' do
let :params do default_params end let :params do default_params end
it { should include_class("nginx::config") } it { should contain_class("nginx::config") }
it { should contain_concat("/etc/nginx/conf.mail.d/#{title}.conf").with({ it { should contain_concat("/etc/nginx/conf.mail.d/#{title}.conf").with({
'owner' => 'root', 'owner' => 'root',
'group' => 'root', 'group' => 'root',

4
spec/defines/resource_vhost_spec.rb
View file

@ -30,8 +30,8 @@ describe 'nginx::resource::vhost' do
describe 'basic assumptions' do describe 'basic assumptions' do
let :params do default_params end let :params do default_params end
it { should include_class("nginx::params") } it { should contain_class("nginx::params") }
it { should include_class("nginx::config") } it { should contain_class("nginx::config") }
it { should contain_concat("/etc/nginx/sites-available/#{title}.conf").with({ it { should contain_concat("/etc/nginx/sites-available/#{title}.conf").with({
'owner' => 'root', 'owner' => 'root',
'group' => 'root', 'group' => 'root',