Follow rspec-puppet path conventions

ekohl · ekohl · commit 9d65116555ec · 2022-02-03T13:38:38.000+01:00
rspec-puppet places all classes in spec/classes and automatically
applies the correct type. The same is true for defines in spec/defines.
diff --git a/spec/classes/client_spec.rb b/spec/classes/client_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::client', type: :class do
+describe 'postgresql::client' do
   let :facts do
     {
       os: {
diff --git a/spec/classes/globals_spec.rb b/spec/classes/globals_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::globals', type: :class do
+describe 'postgresql::globals' do
   context 'on a debian 8' do
     let(:facts) do
       {
diff --git a/spec/classes/lib/devel_spec.rb b/spec/classes/lib/devel_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::lib::devel', type: :class do
+describe 'postgresql::lib::devel' do
   let :facts do
     {
       os: {
diff --git a/spec/classes/lib/java_spec.rb b/spec/classes/lib/java_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::lib::java', type: :class do
+describe 'postgresql::lib::java' do
   describe 'on a debian based os' do
     let :facts do
       {
diff --git a/spec/classes/lib/perl_spec.rb b/spec/classes/lib/perl_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::lib::perl', type: :class do
+describe 'postgresql::lib::perl' do
   describe 'on a redhat based os' do
     let :facts do
       {
diff --git a/spec/classes/lib/pgdocs_spec.rb b/spec/classes/lib/pgdocs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::lib::docs', type: :class do
+describe 'postgresql::lib::docs' do
   describe 'on a redhat based os' do
     let :facts do
       {
diff --git a/spec/classes/lib/python_spec.rb b/spec/classes/lib/python_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::lib::python', type: :class do
+describe 'postgresql::lib::python' do
   describe 'on a redhat based os' do
     let :facts do
       {
diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::params', type: :class do
+describe 'postgresql::params' do
   let :facts do
     {
       os: {
diff --git a/spec/classes/repo_spec.rb b/spec/classes/repo_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::repo', type: :class do
+describe 'postgresql::repo' do
   let :facts do
     {
       os: {
diff --git a/spec/classes/server/config_spec.rb b/spec/classes/server/config_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::config', type: :class do
+describe 'postgresql::server::config' do
   let(:pre_condition) do
     'class { postgresql::server: manage_selinux => true }'
   end
diff --git a/spec/classes/server/contrib_spec.rb b/spec/classes/server/contrib_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::contrib', type: :class do
+describe 'postgresql::server::contrib' do
   let :pre_condition do
     "class { 'postgresql::server': }"
   end
diff --git a/spec/classes/server/initdb_spec.rb b/spec/classes/server/initdb_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::initdb', type: :class do
+describe 'postgresql::server::initdb' do
   let(:pre_condition) do
     'include postgresql::server'
   end
diff --git a/spec/classes/server/plperl_spec.rb b/spec/classes/server/plperl_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::plperl', type: :class do
+describe 'postgresql::server::plperl' do
   let :facts do
     {
       os: {
diff --git a/spec/classes/server/plpython_spec.rb b/spec/classes/server/plpython_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::plpython', type: :class do
+describe 'postgresql::server::plpython' do
   let :facts do
     {
       os: {
diff --git a/spec/classes/server/postgis_spec.rb b/spec/classes/server/postgis_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::postgis', type: :class do
+describe 'postgresql::server::postgis' do
   let :pre_condition do
     "class { 'postgresql::server': }"
   end
diff --git a/spec/classes/server/service_spec.rb b/spec/classes/server/service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::service', type: :class do
+describe 'postgresql::server::service' do
   let :pre_condition do
     'include postgresql::server'
   end
diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server', type: :class do
+describe 'postgresql::server' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/config_entry_spec.rb b/spec/defines/server/config_entry_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::config_entry', type: :define do
+describe 'postgresql::server::config_entry' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/database_grant_spec.rb b/spec/defines/server/database_grant_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::database_grant', type: :define do
+describe 'postgresql::server::database_grant' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/database_spec.rb b/spec/defines/server/database_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::database', type: :define do
+describe 'postgresql::server::database' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/db_spec.rb b/spec/defines/server/db_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::db', type: :define do
+describe 'postgresql::server::db' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/default_privileges_spec.rb b/spec/defines/server/default_privileges_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::default_privileges', type: :define do
+describe 'postgresql::server::default_privileges' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/extension_spec.rb b/spec/defines/server/extension_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::extension', type: :define do # rubocop:disable RSpec/MultipleDescribes
+describe 'postgresql::server::extension' do # rubocop:disable RSpec/MultipleDescribes
   let :pre_condition do
     "class { 'postgresql::server': }
      postgresql::server::database { 'template_postgis':
@@ -119,7 +119,7 @@
   end
 end
 
-describe 'postgresql::server::extension', type: :define do
+describe 'postgresql::server::extension' do
   let :pre_condition do
     "class { 'postgresql::server': }
      postgresql::server::database { 'template_postgis2':
@@ -160,7 +160,7 @@
   end
 end
 
-describe 'postgresql::server::extension', type: :define do
+describe 'postgresql::server::extension' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/grant_role_spec.rb b/spec/defines/server/grant_role_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::grant_role', type: :define do
+describe 'postgresql::server::grant_role' do
   let :pre_condition do
     "class { 'postgresql::server': }"
   end
diff --git a/spec/defines/server/grant_spec.rb b/spec/defines/server/grant_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::grant', type: :define do
+describe 'postgresql::server::grant' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/pg_hba_rule_spec.rb b/spec/defines/server/pg_hba_rule_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::pg_hba_rule', type: :define do
+describe 'postgresql::server::pg_hba_rule' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/pg_ident_rule_spec.rb b/spec/defines/server/pg_ident_rule_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::pg_ident_rule', type: :define do
+describe 'postgresql::server::pg_ident_rule' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/reassign_owned_by_spec.rb b/spec/defines/server/reassign_owned_by_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::reassign_owned_by', type: :define do
+describe 'postgresql::server::reassign_owned_by' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/recovery_spec.rb b/spec/defines/server/recovery_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::recovery', type: :define do
+describe 'postgresql::server::recovery' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/role_spec.rb b/spec/defines/server/role_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::role', type: :define do
+describe 'postgresql::server::role' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/schema_spec.rb b/spec/defines/server/schema_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::schema', type: :define do
+describe 'postgresql::server::schema' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/table_grant_spec.rb b/spec/defines/server/table_grant_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::table_grant', type: :define do
+describe 'postgresql::server::table_grant' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/server/tablespace_spec.rb b/spec/defines/server/tablespace_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::tablespace', type: :define do
+describe 'postgresql::server::tablespace' do
   let :facts do
     {
       os: {
diff --git a/spec/defines/validate_db_connection_spec.rb b/spec/defines/validate_db_connection_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::validate_db_connection', type: :define do
+describe 'postgresql::validate_db_connection' do
   let :facts do
     {
       os: {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`require 'spec_helper'`
`4`	`4`
`5`		`-describe 'postgresql::client', type: :class do`
	`5`	`+describe 'postgresql::client' do`
`6`	`6`	`let :facts do`
`7`	`7`	`{`
`8`	`8`	`os: {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`require 'spec_helper'`
`4`	`4`
`5`		`-describe 'postgresql::globals', type: :class do`
	`5`	`+describe 'postgresql::globals' do`
`6`	`6`	`context 'on a debian 8' do`
`7`	`7`	`let(:facts) do`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`require 'spec_helper'`
`4`	`4`
`5`		`-describe 'postgresql::lib::devel', type: :class do`
	`5`	`+describe 'postgresql::lib::devel' do`
`6`	`6`	`let :facts do`
`7`	`7`	`{`
`8`	`8`	`os: {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`require 'spec_helper'`
`4`	`4`
`5`		`-describe 'postgresql::lib::java', type: :class do`
	`5`	`+describe 'postgresql::lib::java' do`
`6`	`6`	`describe 'on a debian based os' do`
`7`	`7`	`let :facts do`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`require 'spec_helper'`
`4`	`4`
`5`		`-describe 'postgresql::lib::perl', type: :class do`
	`5`	`+describe 'postgresql::lib::perl' do`
`6`	`6`	`describe 'on a redhat based os' do`
`7`	`7`	`let :facts do`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`require 'spec_helper'`
`4`	`4`
`5`		`-describe 'postgresql::lib::docs', type: :class do`
	`5`	`+describe 'postgresql::lib::docs' do`
`6`	`6`	`describe 'on a redhat based os' do`
`7`	`7`	`let :facts do`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`require 'spec_helper'`
`4`	`4`
`5`		`-describe 'postgresql::lib::python', type: :class do`
	`5`	`+describe 'postgresql::lib::python' do`
`6`	`6`	`describe 'on a redhat based os' do`
`7`	`7`	`let :facts do`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`require 'spec_helper'`
`4`	`4`
`5`		`-describe 'postgresql::params', type: :class do`
	`5`	`+describe 'postgresql::params' do`
`6`	`6`	`let :facts do`
`7`	`7`	`{`
`8`	`8`	`os: {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`require 'spec_helper'`
`4`	`4`
`5`		`-describe 'postgresql::repo', type: :class do`
	`5`	`+describe 'postgresql::repo' do`
`6`	`6`	`let :facts do`
`7`	`7`	`{`
`8`	`8`	`os: {`