diff --git a/spec/classes/config_spec.rb b/spec/classes/config_spec.rb index ed3e0e0..0f4f6a7 100644 --- a/spec/classes/config_spec.rb +++ b/spec/classes/config_spec.rb @@ -27,7 +27,7 @@ describe 'nginx::config' do } end - it { should include_class("nginx::params") } + it { should contain_class("nginx::params") } it { should contain_file("/etc/nginx").with( :ensure => 'directory', diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb index 3f6e7f7..0110e5f 100644 --- a/spec/classes/nginx_spec.rb +++ b/spec/classes/nginx_spec.rb @@ -23,7 +23,7 @@ describe 'nginx' do it { should contain_nginx__package } it { should contain_nginx__config } 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__vhost("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__config } 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__vhost("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__config } 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__vhost("test2.local") } it { should contain_nginx__resource__location("test2.local") } diff --git a/spec/defines/resource_location_spec.rb b/spec/defines/resource_location_spec.rb index 22a89af..912aecd 100644 --- a/spec/defines/resource_location_spec.rb +++ b/spec/defines/resource_location_spec.rb @@ -27,8 +27,8 @@ describe 'nginx::resource::location' do :vhost => 'vhost1', } end - it { should include_class("nginx::params") } - it { should include_class("nginx::config") } + it { should contain_class("nginx::params") } + it { should contain_class("nginx::config") } 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_concat__fragment("vhost1-800-rspec-test-ssl") } diff --git a/spec/defines/resource_mailhost_spec.rb b/spec/defines/resource_mailhost_spec.rb index 9f71a6c..ff575e2 100644 --- a/spec/defines/resource_mailhost_spec.rb +++ b/spec/defines/resource_mailhost_spec.rb @@ -29,7 +29,7 @@ describe 'nginx::resource::mailhost' do describe 'basic assumptions' do 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({ 'owner' => 'root', 'group' => 'root', diff --git a/spec/defines/resource_vhost_spec.rb b/spec/defines/resource_vhost_spec.rb index e65ae2f..f546cb8 100644 --- a/spec/defines/resource_vhost_spec.rb +++ b/spec/defines/resource_vhost_spec.rb @@ -30,8 +30,8 @@ describe 'nginx::resource::vhost' do describe 'basic assumptions' do let :params do default_params end - it { should include_class("nginx::params") } - it { should include_class("nginx::config") } + it { should contain_class("nginx::params") } + it { should contain_class("nginx::config") } it { should contain_concat("/etc/nginx/sites-available/#{title}.conf").with({ 'owner' => 'root', 'group' => 'root',