Add test suite with retrospec

.fixtures.yml

 fixtures:
     symlinks:
-      freeradius: "#{source_dir}"
+      puppet-freeradius: "#{source_dir}"
     repositories:
       stdlib:
         repo: https://github.com/puppetlabs/puppetlabs-stdlib.git

.gitignore

-*.swp
-pkg/
-spec/fixures/
-.gemfile.lock
+.*.sw?
+pkg
+spec/fixtures
+.rspec_system
+.vagrant
+.bundle
+vendor
+.idea
+.project
+.DS_Store
+

.puppet-lint.rc

@@ -3,6 +3,53 @@
 # refer to <http://puppet-lint.com/checks/>.
 
 # Examples (uncomment before use):
+
+# spacing, indentation and whitespace
+#--no-2sp_soft_tabs-check
+#--no-hard_tabs-check
+#--no-trailing_whitespace-check
 #--no-80chars-check
+#--no-arrow_alignment-check
+
+# comments
+#--no-slash_comments-check
+#--no-star_comments-check
+
+# quoting
+#--no-double_quoted_strings-check
+#--no-variables_not_enclosed-check
+#--no-only_variable_string-check
+#--no-single_quote_string_with_variables-check
+#--no-quoted_booleans-check
+#--no-puppet_url_without_modules-check
+
+# resources
+#--no-unquoted_resource_title-check
+#--no-ensure_first_param-check
+#--no-ensure_not_symlink_target-check
+#--no-file_mode-check
+#--no-unquoted_file_mode-check
+#--no-duplicate_params-check
+
+# conditionals
+#--no-selector_inside_resource-check
+#--no-case_without_default-check
+
+# classes
 #--no-class_inherits_from_params_class-check
+#--no-autoloader_layout-check
+#--no-right_to_left_relationship-check
+#--no-nested_classes_or_defines-check
 #--no-inherits_across_namespaces-check
+#--no-variable_scope-check
+#--no-variable_contains_dash-check
+#--no-parameter_order-check
+#--no-names_containing_dash-check
+
+# documentation
+#--no-documentation-check
+
+# nodes
+#--no-unquoted_node_name-check
+
+# For more controls please see http://puppet-lint.com/plugins/
\ No newline at end of file

CHANGELOG.md

-## Changelog
+## Release 0.0.1
+### Summary
 
-### 3.6.0
-  * Add support for Debian 9 (thanks @its-not-a-bug-its-a-feature)
+Adds several new features and updates
 
-### 3.5.0
-  * Add support for huntgroups (thanks @sts and @phaer)
+### Features
+- Deprecation function X in favor of Y.
+- Updated Gemfile to deal with parallel_tests Ruby dependancy
 
-### 3.4.3
-  * Fix missing notify that caused problems when adding a new virtual server in `sites_available`
+### Bugfixes
+- README typo fixes.
+- Updates deprecation tests to include future parser.
 
-### 3.4.1
-  * Fix calling syntax for logrotate
-  * Add param `package_ensure`
-
-### 3.4.0
-  * Fix bug with modules that have ensure => absent
-  * Fix bug with module::files where content and source
-  * Fix bug with path of krb5 module
-  * Manage parameter `allow_expired_crl`
-  * Clean up comments in templates to reduce the size
-
-### 3.3.0
-  * Deploy modules to `mods_available` and symlink to `mods_enabled`
-  * Deploy modules to `sites_available` and symlink to `sites_enabled`
-
-### 3.2.0
-  * Warn instead of failing if the FR version is not 3.x
-  * Update logrotate module dependency
-  * Add PostgreSQL support
-  * Fix bug with templating home servers in Puppet 4
-  * Fix bug with logrotate postrotate on non Red Hat distros
-
-### 3.1.0
-  * Provide facility to enable/disable specific EAP types in `freeradius::module::eap`
-
-### 3.0.0
-  * More parameters available for `freeradius::client`
-  * Allow management of `freeradius::dictionary` with `source` or `content`
-  * Enable status checks for `freeradius::home_server`
-  * More configurable options for `freeradius` base class
-  * More sensible permissions on various config files
-  * Refactor `freeradius::ldap` as `freeradius::module::ldap` and add more params
-  * Create `freeradius::listen` to manage arbitrary listeners
-  * Create `freeradius::module::detail` to configure detail loggers
-  * Create `freeradius::module::eap` to manage instantiations of the `eap` module
-  * Create `freeradius::module::files` to manage instantiations of the `files` module
-  * Create `freeradius::module::huntgroup` to manage huntgroups
-  * Create `freeradius::module::ippool` to manage ippool resources
-  * Create `freeradius::module::linelog` to configure linelog loggers
-  * Create `freeradius::module::preprocess` to manage instantiations of the `preprocess` module
-  * Fix some compatibility problems with Debian/Ubuntu systems
-  * Allow `freeradius::site` resources (virtual servers) to have their content managed other than just with flat files
-  * Add more options to `freeradius::sql`
-  * Add various types of validation for Puppet 4
-
-### 2.3.1
-  * Fix bug with log rotation throwing errors when radiusd is not running
-
-### 2.3.0
-  * Add support to configure virtual modules for fail-over and load-balancing
-
-### 2.2.0
-  * Add support to configure the krb5 module
-
-### 2.1.4
-  * Fix compatibility with Puppet 4
-
-### 2.1.3
-  * Fix compatibility with Puppet 4
-
-### 2.1.2
-  * Write out ldap config with different syntax for FreeRADIUS 3.0.x and 3.1.x when using multiple servers
-
-### 2.1.1
-
-  * Fix bug with the facts not reporting version numbers accurately
-
-### 2.1.0
-
-  * Various changes to preserve stock modules in a FreeRADIUS installation and be able to toggle them
-
-### 2.0.1
-
-  * Fix up LDAP template to allow better compatibility with FreeRADIUS 3.1.x
-
-### 2.0.0
-
-  * Drop support for FreeRADIUS 2.x, enabling us to keep the codebase tidier
-
-### 1.3.0
-
-  * Add support for defining config templates
-
-### 1.2.6
-
-  * Fix a bug that now enables sqltrace (sqllog) to work on FR3
-
-### 1.2.5
-
-  * Switch to use [saz/rsyslog](https://forge.puppetlabs.com/saz/rsyslog) to manage syslog rules
-
-### 1.2.4
-
-  * Start with just 1 SQL socket by default to avoid overloading the SQL server
-
-### 1.2.3
-
-  * Make facts fail gracefully if radiusd is not installed
-
-### 1.2.2
-
-  * Fix a bug that stops statusclients from working
-
-### 1.2.1
-
-  * Fix a bug that prevent 1.2.0 from working on FreeRADIUS 2
-
-### 1.2.0
-
- * Deprecate `netmask` parameter from `freeradius::client`
-
-### 1.1.0
-
- * Add support to supply an array of multiple LDAP servers
-
-### 1.0.4
-
- * Make an educated guess about the version of FR when the fact is unavailable (e.g. on the first Puppet run)
-
-### 1.0.3
-
- * Iron out a couple of issues with LDAP compatibility with Active Directory
-
-### 1.0.2
-
- * Fixed a bug that prevented LDAP from working on any port except 389
-
-### 1.0.1
-
- * Fixed a bug that caused an error when no proxy config items were defined
-
-### 1.0.0
-
- * Support for FreeRADIUS 3
- * Native support for managing the LDAP module
- * Native support for configuring realms (via realms, home_server and home_server_pool)
- * Improved handling of attribute filtering
- * Improved handling of SQL support
-
-This release retains support for FreeRADIUS 2 but some of the parameters have changed so you will probably need to make changes to the way you use this module. Upgrade on a dev system first!
-
-### 0.4.5
-
- * Tweak wildcard matching on logrotate config
-
-### 0.4.4
-
- * Fix bug displaying deprecation notice and update documentation to reflect this
-
-### 0.4.3
-
- * Manage log rotation with [rodjek/logrotate](https://forge.puppetlabs.com/rodjek/logrotate) instead of deploying flat files
-
-### 0.4.2
-
- * Provide new SQL option custom_query_file
-
-### 0.4.1
-
- * Cease management of custom logging modules `logtofile` and `logtosyslog` since it does not make sense to manage these globally 
- * Purge instantiation of unused modules
-
-### 0.4.0
-
- * Move control_socket into its own class and add parameters
- * Improve the way the status_server is added or removed
- * Delete all unmanaged sites from sites-available
-
-### 0.3.8
-
- * Purge all non-managed sites
-
-### 0.3.7
-
- * Minor linting of code to improve score
- * Minor linting of metadata to improve score
-
-### 0.3.6
-
- * Bugfixes and feature improvements in `freeradius::sql`
-
-### 0.3.5
-
- * Add ability to customise SQL socket lifetimes
- * Purge all non-managed clients
- * Add defined type to blank out unneeded config files without deleting them
-
-### 0.3.4
-
- * Correctly pass template content to control-socket
-
-### 0.3.3
-
- * The default behaviour is now to purge anything in ${confdir}/certs that is not managed by Puppet
-
-### 0.3.2
-
- * Various improvements to support Debian family
- * Optional content parameters in various resources
-
-### 0.3.1
-
- * Fix a bug which prevents the module from working properly on Debian/Ubuntu (thanks @diranged)
-
-### 0.3.0
-
- * Add `ensure` parameter to all defined types
-
-### 0.2.0
-
- * Add support for customising `sql.conf` natively by adding `freeradius::sql`
-
-### 0.1.4
-
- * Fix ambiguity about net/netmask in freeradius::client
-
-### 0.1.3
-
- * Add support for managing firewall rules automatically
- * Add support for installation certificates & keys
- * Make syslog support an optional component
- * Various bugfixes
-
-### 0.1.2
-
- * Improved modular installs with optional components
- * Improved support for Debian
- * Clarify dependencies on other modules
- * Lots of bugfixes
-
-### 0.1.0
-
- * Initial release with support for installing FreeRADIUS and configuring servers, modules, clients and other objects using flat files.
- * Probably works only with FreeRADIUS 2.x
- * Only tested with CentOS 6
 
+This changelog is used track changes with this module in human readable format.
+Feel free to reference tickets with links or other important information the 
+reader would find useful when determining the level of risk with upgrading.
+For more information on changelogs please [see the keeping a changelog site](http://keepachangelog.com/en/0.3.0/). 
\ No newline at end of file

DEVELOPMENT.md

+# module name 
+
+## Module development setup
+
+Install all the require gems to run test code
+```shell
+bundle install  (only need to do once)
+
+```
+## Running Tests
+
+### Unit tests
+This type of testing is fast and should be the first thing you do before committing your code.  Mistakes can be found
+in a matter of seconds vs minutes/hours.  You can test your logic in a unit test.  The downside is you need to learn
+how to write unit tests which can take some initial time getting used to.
+
+```shell
+bundle exec rake spec
+
+```
+
+### Integration Testing
+This type of testing is somewhat manual and requires the use of vagrant and a test vm that is controlled by vagrant.
+You can find the list of available test vms by running `vagrant status` in the root of the module directory.  There is 
+at lot of magic happening in the vagrantfile that makes this easy.  Windows support with this module has not been added yet.
+
+```shell
+
+$ vagrant status
+Current machine states:
+
+win2012r2                 not created (vmware_fusion)
+win2008r2                 not created (vmware_fusion)
+centos6                   running (vmware_fusion)
+```
+
+To run a test first you need to define the test code located in module_root/tests directory.  This code is nothing more
+than a bunch of puppet code that uses your manifest code.  You will be using puppet apply to run this code on the vm. 
+Have a look inside the tests directory for examples.
+
+Example test file
+```
+include profiles::default_linux
+file{'/tmp/test.txt':
+    ensure => file,
+    content => 'Hello World'
+}
+```
+
+There are a few ways to run the test code against a test vm, both of which have the same outcome.
+
+```shell
+bundle exec rake spec_prep
+VAGRANT_MANIFEST=linux.pp vagrant provision centos6
+```
+
+or use the rake command which bundles the two commands together
+
+```shell
+bundle exec rake "vagrant_up[linux.pp,centos6]"
+```
+
+### Acceptance Tests 
+Acceptance testing is sorta like combining unit testing and integration testing where it tests the code on real systems
+automatically across a wide range of operating systems.  This is an advanced topic, so you will want to master unit and
+integration testing first before writing acceptance tests.
+
+```shell
+bundle exec rake beaker
+
+```
+
+
+## CI config doc
+https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/configuration/advanced-configuration.md

Gemfile

@@ -2,19 +2,20 @@ source "https://rubygems.org"
 
 group :test do
     gem "rake"
-    gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.8.3'
-    gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
+    gem "puppet", ENV['PUPPET_GEM_VERSION'] || '~> 3.8.3'
+    gem "rspec-puppet"
     gem "puppetlabs_spec_helper"
-    gem 'rspec-puppet-utils', :git => 'https://github.com/Accuity/rspec-puppet-utils.git'
+    gem 'rspec-puppet-utils'
     gem 'hiera-puppet-helper', :git => 'https://github.com/bobtfish/hiera-puppet-helper.git'
     gem "metadata-json-lint"
     gem 'puppet-syntax'
     gem 'puppet-lint'
 end
 
+# to disable installing the 50+ gems this group contains run : bundle install --without integration
 group :integration do
-    gem "beaker", :git => 'https://github.com/puppetlabs/beaker.git'
-    gem "beaker-rspec", :git => 'https://github.com/puppetlabs/beaker-rspec.git'
+    gem "beaker"
+    gem "beaker-rspec"
     gem "vagrant-wrapper"
     gem 'serverspec'
 end
@@ -23,5 +24,7 @@ group :development do
     gem "travis"
     gem "travis-lint"
     gem "puppet-blacksmith"
-    gem "guard-rake"
+    gem 'puppet-debugger'
+# This gem causes bundler install erorrs
+#    gem "guard-rake"
 end

Rakefile

@@ -14,7 +14,7 @@ end
 
 PuppetLint.configuration.relative = true
 PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"
+PuppetLint.configuration.log_format = "%{path}:%{line}:%{check}:%{KIND}:%{message}"
 PuppetLint.configuration.fail_on_warnings = true
 
 # Forsake support for Puppet 2.6.2 for the benefit of cleaner code.

spec/classes/control_socket_spec.rb

@@ -9,28 +9,28 @@ describe 'freeradius::control_socket' do
   # rspec-puppet does not allow you to swap out hiera data on a per test block
   #include_context :hiera
 
-  
   # below is the facts hash that gives you the ability to mock
   # facts on a per describe/context block.  If you use a fact in your
   # manifest you should mock the facts below.
   let(:facts) do
     {}
   end
+
   # below is a list of the resource parameters that you can override.
   # By default all non-required parameters are commented out,
   # while all required parameters will require you to add a value
   let(:params) do
     {
-      #:mode => "ro",
+      # mode: "ro",
     }
   end
   # add these two lines in a single test block to enable puppet and hiera debug mode
   # Puppet::Util::Log.level = :debug
   # Puppet::Util::Log.newdestination(:console)
+  
   it do
-    is_expected.to contain_freeradius__site('control-socket')
-      .with(
-        'content' => 'template(freeradius/sites-enabled/control-socket.erb)'
+    is_expected.to contain_freeradius__site('control-socket').with(
+      content: [],
     )
   end
 end

spec/classes/freeradius_spec.rb

@@ -9,365 +9,426 @@ describe 'freeradius' do
   # rspec-puppet does not allow you to swap out hiera data on a per test block
   #include_context :hiera
 
-  
   # below is the facts hash that gives you the ability to mock
   # facts on a per describe/context block.  If you use a fact in your
   # manifest you should mock the facts below.
   let(:facts) do
     {}
   end
+
   # below is a list of the resource parameters that you can override.
   # By default all non-required parameters are commented out,
   # while all required parameters will require you to add a value
   let(:params) do
     {
-      #:control_socket => false,
-      #:max_servers => "4096",
-      #:max_requests => "4096",
-      #:mysql_support => false,
-      #:perl_support => false,
-      #:utils_support => false,
-      #:ldap_support => false,
-      #:krb5_support => false,
-      #:wpa_supplicant => false,
-      #:winbind_support => false,
-      #:syslog => false,
-      #:log_auth => 'no',
+      # control_socket: false,
+      # max_servers: "4096",
+      # max_requests: "4096",
+      # mysql_support: false,
+      # pgsql_support: false,
+      # perl_support: false,
+      # utils_support: false,
+      # ldap_support: false,
+      # dhcp_support: false,
+      # krb5_support: false,
+      # wpa_supplicant: false,
+      # winbind_support: false,
+      # log_destination: "files",
+      # syslog: false,
+      # log_auth: "no",
+      # preserve_mods: true,
+      # correct_escapes: true,
+      # manage_logpath: true,
+      # package_ensure: "installed",
+      # radacctdir: "$freeradius::params::radacctdir",
     }
   end
   # add these two lines in a single test block to enable puppet and hiera debug mode
   # Puppet::Util::Log.level = :debug
   # Puppet::Util::Log.newdestination(:console)
+  
+  it do
+    is_expected.to contain_notify('This module is only compatible with FreeRADIUS 3.')
+  end  
+  
+  it do
+    is_expected.to contain_file('radiusd.conf').with(
+      name: '$freeradius::fr_basepath/radiusd.conf',
+      mode: '0644',
+      owner: 'root',
+      group: '$freeradius::fr_group',
+      content: [],
+      require: ['Package[$freeradius::fr_package]', 'Group[$freeradius::fr_group]'],
+      notify: 'Service[$freeradius::fr_service]',
+    )
+  end
+  
+  it do
+    is_expected.to contain_file(['$freeradius::fr_basepath/statusclients.d', '$freeradius::fr_basepath', '$freeradius::fr_basepath/conf.d', '$freeradius::fr_basepath/attr.d', '$freeradius::fr_basepath/users.d', '$freeradius::fr_basepath/policy.d', '$freeradius::fr_basepath/dictionary.d', '$freeradius::fr_basepath/scripts']).with(
+      ensure: 'directory',
+      mode: '0755',
+      owner: 'root',
+      group: '$freeradius::fr_group',
+      require: ['Package[$freeradius::fr_package]', 'Group[$freeradius::fr_group]'],
+      notify: 'Service[$freeradius::fr_service]',
+    )
+  end
+  
+  it do
+    is_expected.to contain_file(['$freeradius::fr_basepath/certs', '$freeradius::fr_basepath/clients.d', '$freeradius::fr_basepath/listen.d', '$freeradius::fr_basepath/sites-enabled', '$freeradius::fr_basepath/mods-enabled', '$freeradius::fr_basepath/instantiate']).with(
+      ensure: 'directory',
+      purge: true,
+      recurse: true,
+      mode: '0755',
+      owner: 'root',
+      group: '$freeradius::fr_group',
+      require: ['Package[$freeradius::fr_package]', 'Group[$freeradius::fr_group]'],
+      notify: 'Service[$freeradius::fr_service]',
+    )
+  end
+  
   it do
-    is_expected.to contain_file('radiusd.conf')
-      .with(
-        'content' => 'template(freeradius/radiusd.conf.fr$freeradius::fr_version.erb)',
-        'group'   => '$freeradius::fr_group',
-        'mode'    => '0640',
-        'name'    => '$freeradius::fr_basepath/radiusd.conf',
-        'notify'  => 'Service[$freeradius::fr_service]',
-        'owner'   => 'root',
-        'require' => '[Package[$freeradius::fr_package], Group[$freeradius::fr_group]]'
+    is_expected.to contain_freeradius__module(['always', 'cache_eap', 'chap', 'detail', 'detail.log', 'digest', 'dynamic_clients', 'echo', 'exec', 'expiration', 'expr', 'files', 'linelog', 'logintime', 'mschap', 'ntlm_auth', 'pap', 'passwd', 'preprocess', 'radutmp', 'realm', 'replicate', 'soh', 'sradutmp', 'unix', 'unpack', 'utf8']).with(
+      preserve: true,
     )
   end
+  
   it do
-    is_expected.to contain_file('[$freeradius::fr_basepath/statusclients.d, $freeradius::fr_basepath, $freeradius::fr_basepath/conf.d, $freeradius::fr_basepath/attr.d, $freeradius::fr_basepath/users.d, $freeradius::fr_basepath/policy.d, $freeradius::fr_basepath/dictionary.d, $freeradius::fr_basepath/scripts]')
-      .with(
-        'ensure'  => 'directory',
-        'group'   => '$freeradius::fr_group',
-        'mode'    => '0750',
-        'notify'  => 'Service[$freeradius::fr_service]',
-        'owner'   => 'root',
-        'require' => '[Package[$freeradius::fr_package], Group[$freeradius::fr_group]]'
+    is_expected.to contain_concat('$freeradius::fr_basepath/policy.conf').with(
+      owner: 'root',
+      group: '$freeradius::fr_group',
+      mode: '0640',
+      require: ['Package[$freeradius::fr_package]', 'Group[$freeradius::fr_group]'],
+      notify: 'Service[$freeradius::fr_service]',
     )
   end
+  
   it do
-    is_expected.to contain_file('[$freeradius::fr_basepath/certs, $freeradius::fr_basepath/clients.d, $freeradius::fr_basepath/sites-enabled, $freeradius::fr_basepath/sites-available, $freeradius::fr_basepath/instantiate]')
-      .with(
-        'ensure'  => 'directory',
-        'group'   => '$freeradius::fr_group',
-        'mode'    => '0750',
-        'notify'  => 'Service[$freeradius::fr_service]',
-        'owner'   => 'root',
-        'purge'   => 'true',
-        'recurse' => 'true',
-        'require' => '[Package[$freeradius::fr_package], Group[$freeradius::fr_group]]'
+    is_expected.to contain_concat__fragment('policy_header').with(
+      target: '$freeradius::fr_basepath/policy.conf',
+      content: 'policy {\n',
+      order: '10',
     )
   end
+  
   it do
-    is_expected.to contain_freeradius__module('eap')
-      .with(
-        'ensure' => 'absent'
+    is_expected.to contain_concat__fragment('policy_footer').with(
+      target: '$freeradius::fr_basepath/policy.conf',
+      content: '}\n',
+      order: '99',
     )
   end
+  
   it do
-    is_expected.to contain_concat('$freeradius::fr_basepath/policy.conf')
-      .with(
-        'group'   => '$freeradius::fr_group',
-        'mode'    => '0640',
-        'notify'  => 'Service[$freeradius::fr_service]',
-        'owner'   => 'root',
-        'require' => '[Package[$freeradius::fr_package], Group[$freeradius::fr_group]]'
+    is_expected.to contain_concat('$freeradius::fr_basepath/templates.conf').with(
+      owner: 'root',
+      group: '$freeradius::fr_group',
+      mode: '0640',
+      require: ['Package[$freeradius::fr_package]', 'Group[$freeradius::fr_group]'],
+      notify: 'Service[$freeradius::fr_service]',
     )
   end
+  
   it do
-    is_expected.to contain_concat__fragment('policy_header')
-      .with(
-        'content' => 'policy {\\n',
-        'order'   => '10',
-        'target'  => '$freeradius::fr_basepath/policy.conf'
+    is_expected.to contain_concat__fragment('template_header').with(
+      target: '$freeradius::fr_basepath/templates.conf',
+      source: 'puppet:///modules/freeradius/template.header',
+      order: '05',
     )
   end
+  
   it do
-    is_expected.to contain_concat__fragment('policy_footer')
-      .with(
-        'content' => '}\\n',
-        'order'   => '99',
-        'target'  => '$freeradius::fr_basepath/policy.conf'
+    is_expected.to contain_concat__fragment('template_footer').with(
+      target: '$freeradius::fr_basepath/templates.conf',
+      content: '}\n',
+      order: '95',
     )
   end
+  
   it do
-    is_expected.to contain_concat('$freeradius::fr_basepath/proxy.conf')
-      .with(
-        'group'   => '$freeradius::fr_group',
-        'mode'    => '0640',
-        'notify'  => 'Service[$freeradius::fr_service]',
-        'owner'   => 'root',
-        'require' => '[Package[$freeradius::fr_package], Group[$freeradius::fr_group]]'
+    is_expected.to contain_concat('$freeradius::fr_basepath/proxy.conf').with(
+      owner: 'root',
+      group: '$freeradius::fr_group',
+      mode: '0640',
+      require: ['Package[$freeradius::fr_package]', 'Group[$freeradius::fr_group]'],
+      notify: 'Service[$freeradius::fr_service]',
     )
   end
+  
+  it do
+    is_expected.to contain_concat__fragment('proxy_header').with(
+      target: '$freeradius::fr_basepath/proxy.conf',
+      content: '# Proxy config\n\n',
+      order: '05',
+    )
+  end
+  
+  it do
+    is_expected.to contain_concat('$freeradius::fr_basepath/mods-available/attr_filter').with(
+      owner: 'root',
+      group: '$freeradius::fr_group',
+      mode: '0640',
+      require: ['Package[$freeradius::fr_package]', 'Group[$freeradius::fr_group]'],
+      notify: 'Service[$freeradius::fr_service]',
+    )
+  end
+  
   it do
-    is_expected.to contain_concat__fragment('proxy_header')
-      .with(
-        'content' => '# Proxy config\\n\\n',
-        'order'   => '05',
-        'target'  => '$freeradius::fr_basepath/proxy.conf'
+    is_expected.to contain_file('$freeradius::fr_modulepath/attr_filter').with(
+      ensure: 'link',
+      target: '../mods-available/attr_filter',
     )
   end
+  
   it do
-    is_expected.to contain_concat('$freeradius::fr_modulepath/attr_filter')
-      .with(
-        'group'   => '$freeradius::fr_group',
-        'mode'    => '0640',
-        'notify'  => 'Service[$freeradius::fr_service]',
-        'owner'   => 'root',
-        'require' => '[Package[$freeradius::fr_package], Group[$freeradius::fr_group]]'
+    is_expected.to contain_concat__fragment('attr-default').with(
+      target: '$freeradius::fr_basepath/mods-available/attr_filter',
+      content: [],
+      order: '10',
     )
   end
+  
   it do
-    is_expected.to contain_concat__fragment('attr-default')
-      .with(
-        'content' => 'template(freeradius/attr_default.fr$freeradius::fr_version.erb)',
-        'order'   => '10',
-        'target'  => '$freeradius::fr_modulepath/attr_filter'
+    is_expected.to contain_concat('$freeradius::fr_basepath/dictionary').with(
+      owner: 'root',
+      group: '$freeradius::fr_group',
+      mode: '0640',
+      require: ['Package[$freeradius::fr_package]', 'Group[$freeradius::fr_group]'],
     )
   end
+  
   it do
-    is_expected.to contain_concat('$freeradius::fr_basepath/dictionary')
-      .with(
-        'group'   => '$freeradius::fr_group',
-        'mode'    => '0640',
-        'owner'   => 'root',
-        'require' => '[Package[$freeradius::fr_package], Group[$freeradius::fr_group]]'
+    is_expected.to contain_concat__fragment('dictionary_header').with(
+      target: '$freeradius::fr_basepath/dictionary',
+      source: 'puppet:///modules/freeradius/dictionary.header',
+      order: '10',
     )
   end
+  
   it do
-    is_expected.to contain_concat__fragment('dictionary_header')
-      .with(
-        'order'  => '10',
-        'source' => 'puppet:///modules/freeradius/dictionary.header',
-        'target' => '$freeradius::fr_basepath/dictionary'
+    is_expected.to contain_concat__fragment('dictionary_footer').with(
+      target: '$freeradius::fr_basepath/dictionary',
+      source: 'puppet:///modules/freeradius/dictionary.footer',
+      order: '90',
     )
   end
+  
   it do
-    is_expected.to contain_concat__fragment('dictionary_footer')
-      .with(
-        'order'  => '90',
-        'source' => 'puppet:///modules/freeradius/dictionary.footer',
-        'target' => '$freeradius::fr_basepath/dictionary'
+    is_expected.to contain_concat('$freeradius::fr_basepath/mods-config/preprocess/huntgroups').with(
+      owner: 'root',
+      group: '$freeradius::fr_group',
+      mode: '0640',
+      require: ['Package[$freeradius::fr_package]', 'Group[$freeradius::fr_group]'],
     )
   end
+  
   it do
-    is_expected.to contain_package('freeradius')
-      .with(
-        'ensure' => 'installed',
-        'name'   => '$freeradius::fr_package'
+    is_expected.to contain_concat__fragment('huntgroups_header').with(
+      target: '$freeradius::fr_basepath/mods-config/preprocess/huntgroups',
+      source: 'puppet:///modules/freeradius/huntgroups.header',
+      order: '10',
     )
   end
+  
   it do
-    is_expected.to contain_service('$freeradius::fr_service')
-      .with(
-        'enable'     => 'true',
-        'ensure'     => 'running',
-        'hasrestart' => 'true',
-        'hasstatus'  => '$freeradius::fr_service_has_status',
-        'name'       => '$freeradius::fr_service',
-        'require'    => '[Exec[radiusd-config-test], File[radiusd.conf], User[$freeradius::fr_user], Package[$freeradius::fr_package]]'
+    is_expected.to contain_package('freeradius').with(
+      ensure: 'installed',
+      name: '$freeradius::fr_package',
     )
   end
+  
   it do
-    is_expected.to contain_user('$freeradius::fr_user')
-      .with(
-        'ensure'  => 'present',
-        'groups'  => '$winbind_support ? { true => $freeradius::fr_wbpriv_user, default => undef }',
-        'require' => 'Package[$freeradius::fr_package]'
+    is_expected.to contain_package('freeradius-mysql').with(
+      ensure: 'installed',
     )
   end
+  
   it do
-    is_expected.to contain_group('$freeradius::fr_group')
-      .with(
-        'ensure'  => 'present',
-        'require' => 'Package[$freeradius::fr_package]'
+    is_expected.to contain_package('freeradius-postgresql').with(
+      ensure: 'installed',
     )
   end
+  
   it do
-    is_expected.to contain_freeradius__module('always')
-      .with(      )
+    is_expected.to contain_package('freeradius-perl').with(
+      ensure: 'installed',
+    )
   end
+  
   it do
-    is_expected.to contain_freeradius__module('detail')
-      .with(      )
+    is_expected.to contain_package('freeradius-utils').with(
+      ensure: 'installed',
+    )
   end
+  
   it do
-    is_expected.to contain_freeradius__module('detail.log')
-      .with(      )
+    is_expected.to contain_package('freeradius-ldap').with(
+      ensure: 'installed',
+    )
   end
+  
   it do
-    is_expected.to contain_file('[$freeradius::fr_logpath, $freeradius::fr_logpath/radacct]')
-      .with(
-        'mode'    => '0750',
-        'require' => 'Package[$freeradius::fr_package]'
+    is_expected.to contain_package('freeradius-dhcp').with(
+      ensure: 'installed',
     )
   end
+  
   it do
-    is_expected.to contain_file('$freeradius::fr_logpath/radius.log')
-      .with(
-        'group'   => '$freeradius::fr_group',
-        'owner'   => '$freeradius::fr_user',
-        'require' => '[Package[$freeradius::fr_package], User[$freeradius::fr_user], Group[$freeradius::fr_group]]',
-        'seltype' => 'radiusd_log_t'
+    is_expected.to contain_package('freeradius-krb5').with(
+      ensure: 'installed',
     )
   end
+  
   it do
-    is_expected.to contain_logrotate__rule('radacct')
-      .with(
-        'compress'      => 'true',
-        'create'        => 'false',
-        'missingok'     => 'true',
-        'path'          => '$freeradius::fr_logpath/radacct/*/*.log',
-        'postrotate'    => 'kill -HUP `cat /var/run/radiusd/radiusd.pid`',
-        'rotate'        => '7',
-        'rotate_every'  => 'day',
-        'sharedscripts' => 'true'
+    is_expected.to contain_package('wpa_supplicant').with(
+      ensure: 'installed',
+      name: '$freeradius::fr_wpa_supplicant',
     )
   end
+  
   it do
-    is_expected.to contain_logrotate__rule('checkrad')
-      .with(
-        'compress'      => 'true',
-        'create'        => 'true',
-        'missingok'     => 'true',
-        'path'          => '$freeradius::fr_logpath/checkrad.log',
-        'postrotate'    => 'kill -HUP `cat /var/run/radiusd/radiusd.pid`',
-        'rotate'        => '1',
-        'rotate_every'  => 'week',
-        'sharedscripts' => 'true'
+    is_expected.to contain_service('$freeradius::fr_service').with(
+      ensure: 'running',
+      name: '$freeradius::fr_service',
+      require: ['Exec[radiusd-config-test]', 'File[radiusd.conf]', 'User[$freeradius::fr_user]', 'Package[$freeradius::fr_package]'],
+      enable: true,
+      hasstatus: '$freeradius::fr_service_has_status',
+      hasrestart: true,
     )
   end
+  
   it do
-    is_expected.to contain_logrotate__rule('radiusd')
-      .with(
-        'compress'      => 'true',
-        'create'        => 'true',
-        'missingok'     => 'true',
-        'path'          => '$freeradius::fr_logpath/radius*.log',
-        'postrotate'    => 'kill -HUP `cat /var/run/radiusd/radiusd.pid`',
-        'rotate'        => '26',
-        'rotate_every'  => 'week',
-        'sharedscripts' => 'true'
+    is_expected.to contain_user('$freeradius::fr_user').with(
+      ensure: 'present',
+      groups: [],
+      require: 'Package[$freeradius::fr_package]',
     )
   end
+  
   it do
-    is_expected.to contain_file('[$freeradius::fr_basepath/certs/dh, $freeradius::fr_basepath/certs/random]')
-      .with(
-        'require' => 'Exec[dh, random]'
+    is_expected.to contain_group('$freeradius::fr_group').with(
+      ensure: 'present',
+      require: 'Package[$freeradius::fr_package]',
     )
   end
+  
   it do
-    is_expected.to contain_exec('dh')
-      .with(
-        'command' => 'openssl dhparam -out $freeradius::fr_basepath/certs/dh 1024',
-        'creates' => '$freeradius::fr_basepath/certs/dh',
-        'path'    => '/usr/bin'
+    is_expected.to contain_rsyslog__snippet('12-radiusd-log').with(
+      content: 'if $programname == 'radiusd' then $freeradius::fr_logpath/radius.log\n&~',
     )
   end
+  
   it do
-    is_expected.to contain_exec('random')
-      .with(
-        'command' => 'dd if=/dev/urandom of=$freeradius::fr_basepath/certs/random count=10 >/dev/null 2>&1',
-        'creates' => '$freeradius::fr_basepath/certs/random',
-        'path'    => '/bin'
+    is_expected.to contain_file(['$freeradius::fr_logpath', '$freeradius::fr_logpath/radacct']).with(
+      mode: '0750',
+      require: 'Package[$freeradius::fr_package]',
     )
   end
+  
   it do
-    is_expected.to contain_exec('radiusd-config-test')
-      .with(
-        'command'     => 'sudo radiusd -XC | grep 'Configuration appears to be OK.' | wc -l',
-        'logoutput'   => 'on_failure',
-        'path'        => '[/bin/, /sbin/, /usr/bin/, /usr/sbin/]',
-        'refreshonly' => 'true',
-        'returns'     => '0'
+    is_expected.to contain_file('$freeradius::fr_logpath/radius.log').with(
+      owner: '$freeradius::fr_user',
+      group: '$freeradius::fr_group',
+      seltype: 'radiusd_log_t',
+      require: ['Package[$freeradius::fr_package]', 'User[$freeradius::fr_user]', 'Group[$freeradius::fr_group]'],
     )
   end
+  
   it do
-    is_expected.to contain_file('[$freeradius::fr_basepath/sites-available/default, $freeradius::fr_basepath/sites-available/inner-tunnel, $freeradius::fr_basepath/clients.conf, $freeradius::fr_basepath/sql.conf]')
-      .with(
-        'content' => '# FILE INTENTIONALLY BLANK\\n',
-        'group'   => '$freeradius::fr_group',
-        'mode'    => '0644',
-        'notify'  => 'Service[$freeradius::fr_service]',
-        'owner'   => 'root',
-        'require' => '[Package[$freeradius::fr_package], Group[$freeradius::fr_group]]'
+    is_expected.to contain_logrotate__rule('radacct').with(
+      path: '$freeradius::fr_logpath/radacct/*/*.log',
+      rotate_every: 'day',
+      rotate: '7',
+      create: nil,
+      missingok: true,
+      compress: true,
+      postrotate: 'kill -HUP `cat $freeradius::fr_pidfile`',
+      sharedscripts: true,
     )
   end
+  
   it do
-    is_expected.to contain_package('freeradius-mysql')
-      .with(
-        'ensure' => 'installed'
+    is_expected.to contain_logrotate__rule('checkrad').with(
+      path: '$freeradius::fr_logpath/checkrad.log',
+      rotate_every: 'week',
+      rotate: '1',
+      create: true,
+      missingok: true,
+      compress: true,
+      postrotate: 'kill -HUP `cat $freeradius::fr_pidfile`',
+      sharedscripts: true,
     )
   end
+  
   it do
-    is_expected.to contain_package('freeradius-perl')
-      .with(
-        'ensure' => 'installed'
+    is_expected.to contain_logrotate__rule('radiusd').with(
+      path: '$freeradius::fr_logpath/radius*.log',
+      rotate_every: 'week',
+      rotate: '26',
+      create: true,
+      missingok: true,
+      compress: true,
+      postrotate: 'kill -HUP `cat $freeradius::fr_pidfile`',
+      sharedscripts: true,
     )
   end
+  
   it do
-    is_expected.to contain_package('freeradius-utils')
-      .with(
-        'ensure' => 'installed'
+    is_expected.to contain_file(['$freeradius::fr_basepath/certs/dh', '$freeradius::fr_basepath/certs/random']).with(
+      require: 'Exec[dh, random]',
     )
   end
+  
   it do
-    is_expected.to contain_package('freeradius-ldap')
-      .with(
-        'ensure' => 'installed'
+    is_expected.to contain_exec('dh').with(
+      command: 'openssl dhparam -out $freeradius::fr_basepath/certs/dh 1024',
+      creates: '$freeradius::fr_basepath/certs/dh',
+      path: '/usr/bin',
     )
   end
+  
   it do
-    is_expected.to contain_package('freeradius-krb5')
-      .with(
-        'ensure' => 'installed'
+    is_expected.to contain_exec('random').with(
+      command: 'dd if=/dev/urandom of=$freeradius::fr_basepath/certs/random count=10 >/dev/null 2>&1',
+      creates: '$freeradius::fr_basepath/certs/random',
+      path: '/bin',
     )
   end
+  
   it do
-    is_expected.to contain_package('wpa_supplicant')
-      .with(
-        'ensure' => 'installed',
-        'name'   => '$freeradius::fr_wpa_supplicant'
+    is_expected.to contain_exec('radiusd-config-test').with(
+      command: 'sudo radiusd -XC | grep 'Configuration appears to be OK.' | wc -l',
+      returns: '0',
+      refreshonly: true,
+      logoutput: 'on_failure',
+      path: ['/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/'],
     )
   end
+  
   it do
-    is_expected.to contain_syslog__rule('radiusd-log')
-      .with(
-        'command' => 'if $programname == 'radiusd' then $freeradius::fr_logpath/radius.log\\n&~',
-        'order'   => '12'
+    is_expected.to contain_file(['$freeradius::fr_basepath/clients.conf', '$freeradius::fr_basepath/sql.conf']).with(
+      content: '# FILE INTENTIONALLY BLANK\n',
+      mode: '0644',
+      owner: 'root',
+      group: '$freeradius::fr_group',
+      require: ['Package[$freeradius::fr_package]', 'Group[$freeradius::fr_group]'],
+      notify: 'Service[$freeradius::fr_service]',
     )
   end
+  
   it do
-    is_expected.to contain_exec('delete-radius-rpmnew')
-      .with(
-        'command' => 'find $freeradius::fr_basepath -name *.rpmnew -delete',
-        'onlyif'  => 'find $freeradius::fr_basepath -name *.rpmnew | grep rpmnew',
-        'path'    => '[/bin/, /sbin/, /usr/bin/, /usr/sbin/]'
+    is_expected.to contain_exec('delete-radius-rpmnew').with(
+      command: 'find $freeradius::fr_basepath -name *.rpmnew -delete',
+      onlyif: 'find $freeradius::fr_basepath -name *.rpmnew | grep rpmnew',
+      path: ['/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/'],
     )
   end
+  
   it do
-    is_expected.to contain_exec('delete-radius-rpmsave')
-      .with(
-        'command' => 'find $freeradius::fr_basepath -name *.rpmsave -delete',
-        'onlyif'  => 'find $freeradius::fr_basepath -name *.rpmsave | grep rpmsave',
-        'path'    => '[/bin/, /sbin/, /usr/bin/, /usr/sbin/]'
+    is_expected.to contain_exec('delete-radius-rpmsave').with(
+      command: 'find $freeradius::fr_basepath -name *.rpmsave -delete',
+      onlyif: 'find $freeradius::fr_basepath -name *.rpmsave | grep rpmsave',
+      path: ['/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/'],
     )
   end
 end

spec/classes/module/preprocess_spec.rb

+require 'spec_helper'
+require 'shared_contexts'
+
+describe 'freeradius::module::preprocess' do
+  # by default the hiera integration uses hiera data from the shared_contexts.rb file
+  # but basically to mock hiera you first need to add a key/value pair
+  # to the specific context in the spec/shared_contexts.rb file
+  # Note: you can only use a single hiera context per describe/context block
+  # rspec-puppet does not allow you to swap out hiera data on a per test block
+  #include_context :hiera
+
+  # below is the facts hash that gives you the ability to mock
+  # facts on a per describe/context block.  If you use a fact in your
+  # manifest you should mock the facts below.
+  let(:facts) do
+    {}
+  end
+
+  # below is a list of the resource parameters that you can override.
+  # By default all non-required parameters are commented out,
+  # while all required parameters will require you to add a value
+  let(:params) do
+    {
+      # ensure: "present",
+      # moddir: "${modconfdir}/${.:instance}",
+      # huntgroups: "${moddir}/huntgroups",
+      # hints: "${moddir}/hints",
+      # with_ascend_hack: "no",
+      # ascend_channels_per_line: "23",
+      # with_ntdomain_hack: "no",
+      # with_specialix_jetstream_hack: "no",
+      # with_cisco_vsa_hack: "no",
+    }
+  end
+  # add these two lines in a single test block to enable puppet and hiera debug mode
+  # Puppet::Util::Log.level = :debug
+  # Puppet::Util::Log.newdestination(:console)
+  
+  it do
+    is_expected.to contain_freeradius__module('preprocess').with(
+      ensure: 'present',
+      content: [],
+    )
+  end
+end

spec/classes/params_spec.rb

@@ -9,13 +9,13 @@ describe 'freeradius::params' do
   # rspec-puppet does not allow you to swap out hiera data on a per test block
   #include_context :hiera
 
-  
   # below is the facts hash that gives you the ability to mock
   # facts on a per describe/context block.  If you use a fact in your
   # manifest you should mock the facts below.
   let(:facts) do
     {}
   end
+
   # below is a list of the resource parameters that you can override.
   # By default all non-required parameters are commented out,
   # while all required parameters will require you to add a value

spec/classes/status_server_spec.rb

@@ -9,30 +9,29 @@ describe 'freeradius::status_server' do
   # rspec-puppet does not allow you to swap out hiera data on a per test block
   #include_context :hiera
 
-  
   # below is the facts hash that gives you the ability to mock
   # facts on a per describe/context block.  If you use a fact in your
   # manifest you should mock the facts below.
   let(:facts) do
     {}
   end
+
   # below is a list of the resource parameters that you can override.
   # By default all non-required parameters are commented out,
   # while all required parameters will require you to add a value
   let(:params) do
     {
-      :secret => 'place_value_here',
-      #:port => "18121",
-      #:listen => "*",
+      # port: "18121",
+      # listen: "*",
     }
   end
   # add these two lines in a single test block to enable puppet and hiera debug mode
   # Puppet::Util::Log.level = :debug
   # Puppet::Util::Log.newdestination(:console)
+  
   it do
-    is_expected.to contain_freeradius__site('status')
-      .with(
-        'content' => 'template(freeradius/sites-enabled/status.erb)'
+    is_expected.to contain_freeradius__site('status').with(
+      content: [],
     )
   end
 end

spec/defines/attr_spec.rb

@@ -17,38 +17,41 @@ describe 'freeradius::attr' do
   let(:facts) do
     {}
   end
+
   # below is a list of the resource parameters that you can override.
   # By default all non-required parameters are commented out,
   # while all required parameters will require you to add a value
   let(:params) do
     {
-      :source => 'place_value_here',
-      #:ensure => present,
-      #:key => "User-Name",
-      #:prefix => "filter",
+      source: nil,
+      # ensure: "present",
+      # key: "User-Name",
+      # prefix: "filter",
+
     }
   end
   # add these two lines in a single test block to enable puppet and hiera debug mode
   # Puppet::Util::Log.level = :debug
   # Puppet::Util::Log.newdestination(:console)
+  
   it do
-    is_expected.to contain_file('$fr_version ? { 2 => $fr_basepath, 3 => $fr_moduleconfigpath/attr_filter, default => $fr_moduleconfigpath }/XXreplace_meXX')
-      .with(
-        'ensure'  => 'present',
-        'group'   => '$::osfamily ? { RedHat => radiusd, Debian => freerad, default => radiusd }',
-        'mode'    => '0640',
-        'notify'  => 'Service[$fr_service]',
-        'owner'   => 'root',
-        'require' => '[Package[$fr_package], Group[$fr_group]]',
-        'source'  => ''
+    is_expected.to contain_file('$::freeradius::params::fr_moduleconfigpath/attr_filter/$name').with(
+      ensure: 'present',
+      mode: '0640',
+      owner: 'root',
+      group: '$::freeradius::params::fr_group',
+      source: :undef,
+      require: ['Package[$::freeradius::params::fr_package]', 'Group[$::freeradius::params::fr_group]'],
+      notify: 'Service[$::freeradius::params::fr_service]',
     )
   end
+  
   it do
-    is_expected.to contain_concat__fragment('attr-XXreplace_meXX')
-      .with(
-        'content' => 'template(freeradius/attr.fr$fr_version.erb)',
-        'order'   => '20',
-        'target'  => '$::osfamily ? { RedHat => /etc/raddb, Debian => /etc/freeradius, default => /etc/raddb }/$fr_version ? { 2 => modules, 3 => mods-enabled, default => modules }/attr_filter'
+    is_expected.to contain_concat__fragment('attr-$name').with(
+      target: '$::freeradius::params::fr_basepath/mods-available/attr_filter',
+      content: [],
+      order: '20',
     )
   end
+  
 end

spec/defines/blank_spec.rb

@@ -17,25 +17,28 @@ describe 'freeradius::blank' do
   let(:facts) do
     {}
   end
+
   # below is a list of the resource parameters that you can override.
   # By default all non-required parameters are commented out,
   # while all required parameters will require you to add a value
   let(:params) do
     {
+
     }
   end
   # add these two lines in a single test block to enable puppet and hiera debug mode
   # Puppet::Util::Log.level = :debug
   # Puppet::Util::Log.newdestination(:console)
+  
   it do
-    is_expected.to contain_file('$::osfamily ? { RedHat => /etc/raddb, Debian => /etc/freeradius, default => /etc/raddb }/XXreplace_meXX')
-      .with(
-        'content' => '# This file is intentionally left blank to reduce complexity. Blanking it but leaving it present is safer than deleting it, since the package manager will replace some files if they are deleted, leading to unexpected behaviour!',
-        'group'   => '$::osfamily ? { RedHat => radiusd, Debian => freerad, default => radiusd }',
-        'mode'    => '0644',
-        'notify'  => 'Service[$fr_service]',
-        'owner'   => 'root',
-        'require' => '[File[$fr_basepath], Package[$fr_package], Group[$fr_group]]'
+    is_expected.to contain_file('$::freeradius::params::fr_basepath/$name').with(
+      mode: '0644',
+      owner: 'root',
+      group: '$::freeradius::params::fr_group',
+      require: ['File[$::freeradius::params::fr_basepath]', 'Package[$::freeradius::params::fr_package]', 'Group[$::freeradius::params::fr_group]'],
+      notify: 'Service[$::freeradius::params::fr_service]',
+      content: '# This file is intentionally left blank to reduce complexity. Blanking it but leaving it present is safer than deleting it, since the package manager will replace some files if they are deleted, leading to unexpected behaviour!',
     )
   end
+  
 end

spec/defines/cert_spec.rb

@@ -17,32 +17,35 @@ describe 'freeradius::cert' do
   let(:facts) do
     {}
   end
+
   # below is a list of the resource parameters that you can override.
   # By default all non-required parameters are commented out,
   # while all required parameters will require you to add a value
   let(:params) do
     {
-      #:source => undef,
-      #:content => undef,
-      #:type => "key",
-      #:ensure => present,
+      # source: :undef,
+      # content: :undef,
+      # type: "key",
+      # ensure: "present",
+
     }
   end
   # add these two lines in a single test block to enable puppet and hiera debug mode
   # Puppet::Util::Log.level = :debug
   # Puppet::Util::Log.newdestination(:console)
+  
   it do
-    is_expected.to contain_file('$::osfamily ? { RedHat => /etc/raddb, Debian => /etc/freeradius, default => /etc/raddb }/certs/XXreplace_meXX')
-      .with(
-        'content'   => 'undef',
-        'ensure'    => 'present',
-        'group'     => '$::osfamily ? { RedHat => radiusd, Debian => freerad, default => radiusd }',
-        'mode'      => '$type ? { key => 0640, cert => 0644, default => 0644 }',
-        'notify'    => 'Service[$fr_service]',
-        'owner'     => 'root',
-        'require'   => '[File[$fr_basepath/certs], Package[$fr_package], Group[$fr_group]]',
-        'show_diff' => 'false',
-        'source'    => 'undef'
+    is_expected.to contain_file('$::freeradius::params::fr_basepath/certs/$name').with(
+      ensure: 'present',
+      mode: '',
+      owner: 'root',
+      group: '$::freeradius::params::fr_group',
+      source: :undef,
+      content: :undef,
+      show_diff: nil,
+      require: ['File[$::freeradius::params::fr_basepath/certs]', 'Package[$::freeradius::params::fr_package]', 'Group[$::freeradius::params::fr_group]'],
+      notify: 'Service[$::freeradius::params::fr_service]',
     )
   end
+  
 end

spec/defines/client_spec.rb

@@ -17,38 +17,76 @@ describe 'freeradius::client' do
   let(:facts) do
     {}
   end
+
   # below is a list of the resource parameters that you can override.
   # By default all non-required parameters are commented out,
   # while all required parameters will require you to add a value
   let(:params) do
     {
-      :shortname => 'place_value_here',
-      :secret => 'place_value_here',
-      #:ip => undef,
-      #:ip6 => undef,
-      #:virtual_server => undef,
-      #:nastype => undef,
-      #:netmask => undef,
-      #:redirect => undef,
-      #:port => undef,
-      #:srcip => undef,
-      #:firewall => false,
-      #:ensure => present,
+      secret: nil,
+      # shortname: "$title",
+      # ip: :undef,
+      # ip6: :undef,
+      # proto: :undef,
+      # require_message_authenticator: "no",
+      # virtual_server: :undef,
+      # nastype: :undef,
+      # login: :undef,
+      # password: :undef,
+      # coa_server: :undef,
+      # response_window: :undef,
+      # max_connections: :undef,
+      # lifetime: :undef,
+      # idle_timeout: :undef,
+      # redirect: :undef,
+      # port: :undef,
+      # srcip: :undef,
+      # firewall: false,
+      # ensure: "present",
+      # attributes: [],
+      # huntgroups: :undef,
+
     }
   end
   # add these two lines in a single test block to enable puppet and hiera debug mode
   # Puppet::Util::Log.level = :debug
   # Puppet::Util::Log.newdestination(:console)
+  
   it do
-    is_expected.to contain_file('$::osfamily ? { RedHat => /etc/raddb, Debian => /etc/freeradius, default => /etc/raddb }/clients.d/.conf')
-      .with(
-        'content' => 'template(freeradius/client.conf.fr$fr_version.erb)',
-        'ensure'  => 'present',
-        'group'   => '$::osfamily ? { RedHat => radiusd, Debian => freerad, default => radiusd }',
-        'mode'    => '0640',
-        'notify'  => 'Service[$fr_service]',
-        'owner'   => 'root',
-        'require' => '[File[$fr_basepath/clients.d], Group[$fr_group]]'
+    is_expected.to contain_file('$::freeradius::params::fr_basepath/clients.d/$title.conf').with(
+      ensure: 'present',
+      mode: '0640',
+      owner: 'root',
+      group: '$::freeradius::params::fr_group',
+      content: [],
+      require: ['File[$::freeradius::params::fr_basepath/clients.d]', 'Group[$::freeradius::params::fr_group]'],
+      notify: 'Service[$::freeradius::params::fr_service]',
     )
   end
+  
+  it do
+    is_expected.to contain_firewall('100-$title-undef-v4').with(
+      proto: 'udp',
+      dport: :undef,
+      action: 'accept',
+      source: :undef,
+    )
+  end
+  
+  it do
+    is_expected.to contain_firewall('100-$title-undef-v6').with(
+      proto: 'udp',
+      dport: :undef,
+      action: 'accept',
+      provider: 'ip6tables',
+      source: :undef,
+    )
+  end
+  
+  it do
+    is_expected.to contain_freeradius__huntgroup('huntgroup.client.$title.$index').with(
+      
+    )
+  end
+  
 end

spec/defines/config_spec.rb

@@ -17,30 +17,33 @@ describe 'freeradius::config' do
   let(:facts) do
     {}
   end
+
   # below is a list of the resource parameters that you can override.
   # By default all non-required parameters are commented out,
   # while all required parameters will require you to add a value
   let(:params) do
     {
-      #:source => undef,
-      #:content => undef,
-      #:ensure => present,
+      # source: :undef,
+      # content: :undef,
+      # ensure: "present",
+
     }
   end
   # add these two lines in a single test block to enable puppet and hiera debug mode
   # Puppet::Util::Log.level = :debug
   # Puppet::Util::Log.newdestination(:console)
+  
   it do
-    is_expected.to contain_file('$::osfamily ? { RedHat => /etc/raddb, Debian => /etc/freeradius, default => /etc/raddb }/$fr_version ? { 2 => conf.d, 3 => mods-config, default => conf.d }/XXreplace_meXX')
-      .with(
-        'content' => 'undef',
-        'ensure'  => 'present',
-        'group'   => '$::osfamily ? { RedHat => radiusd, Debian => freerad, default => radiusd }',
-        'mode'    => '0640',
-        'notify'  => 'Service[$fr_service]',
-        'owner'   => 'root',
-        'require' => '[Package[$fr_package], Group[$fr_group]]',
-        'source'  => 'undef'
+    is_expected.to contain_file('$::freeradius::params::fr_moduleconfigpath/$name').with(
+      ensure: 'present',
+      mode: '0640',
+      owner: 'root',
+      group: '$::freeradius::params::fr_group',
+      source: :undef,
+      content: :undef,
+      require: ['Package[$::freeradius::params::fr_package]', 'Group[$::freeradius::params::fr_group]'],
+      notify: 'Service[$::freeradius::params::fr_service]',
     )
   end
+  
 end

spec/defines/dictionary_spec.rb

@@ -17,38 +17,43 @@ describe 'freeradius::dictionary' do
   let(:facts) do
     {}
   end
+
   # below is a list of the resource parameters that you can override.
   # By default all non-required parameters are commented out,
   # while all required parameters will require you to add a value
   let(:params) do
     {
-      :source => 'place_value_here',
-      #:order => 50,
-      #:ensure => present,
+      # source: :undef,
+      # content: :undef,
+      # order: "50",
+      # ensure: "present",
+
     }
   end
   # add these two lines in a single test block to enable puppet and hiera debug mode
   # Puppet::Util::Log.level = :debug
   # Puppet::Util::Log.newdestination(:console)
+  
   it do
-    is_expected.to contain_file('$::osfamily ? { RedHat => /etc/raddb, Debian => /etc/freeradius, default => /etc/raddb }/dictionary.d/dictionary.XXreplace_meXX')
-      .with(
-        'ensure'  => 'present',
-        'group'   => '$::osfamily ? { RedHat => radiusd, Debian => freerad, default => radiusd }',
-        'mode'    => '0644',
-        'notify'  => 'Service[$fr_service]',
-        'owner'   => 'root',
-        'require' => '[File[$fr_basepath/dictionary.d], Package[$fr_package], Group[$fr_group]]',
-        'source'  => ''
+    is_expected.to contain_file('$::freeradius::params::fr_basepath/dictionary.d/dictionary.$name').with(
+      ensure: 'present',
+      mode: '0644',
+      owner: 'root',
+      group: '$::freeradius::params::fr_group',
+      source: :undef,
+      content: :undef,
+      require: ['File[$::freeradius::params::fr_basepath/dictionary.d]', 'Package[$::freeradius::params::fr_package]', 'Group[$::freeradius::params::fr_group]'],
+      notify: 'Service[$::freeradius::params::fr_service]',
     )
   end
+  
   it do
-    is_expected.to contain_concat__fragment('dictionary.XXreplace_meXX')
-      .with(
-        'content' => '$INCLUDE $::osfamily ? { RedHat => /etc/raddb, Debian => /etc/freeradius, default => /etc/raddb }/dictionary.d/dictionary.XXreplace_meXX\\n',
-        'order'   => '50',
-        'require' => 'File[$fr_basepath/dictionary.d/dictionary.$name]',
-        'target'  => '$::osfamily ? { RedHat => /etc/raddb, Debian => /etc/freeradius, default => /etc/raddb }/dictionary'
+    is_expected.to contain_concat__fragment('dictionary.$name').with(
+      target: '$::freeradius::params::fr_basepath/dictionary',
+      content: '$INCLUDE $::freeradius::params::fr_basepath/dictionary.d/dictionary.$name\n',
+      order: '50',
+      require: 'File[$::freeradius::params::fr_basepath/dictionary.d/dictionary.$name]',
     )
   end
+  
 end

spec/defines/home_server_pool_spec.rb

@@ -17,26 +17,29 @@ describe 'freeradius::home_server_pool' do
   let(:facts) do
     {}
   end
+
   # below is a list of the resource parameters that you can override.
   # By default all non-required parameters are commented out,
   # while all required parameters will require you to add a value
   let(:params) do
     {
-      :home_server => 'place_value_here',
-      #:type => "fail-over",
-      #:virtual_server => "",
-      #:fallback => "",
+      home_server: nil,
+      # type: "fail-over",
+      # virtual_server: :undef,
+      # fallback: :undef,
+
     }
   end
   # add these two lines in a single test block to enable puppet and hiera debug mode
   # Puppet::Util::Log.level = :debug
   # Puppet::Util::Log.newdestination(:console)
+  
   it do
-    is_expected.to contain_concat__fragment('homeserverpool-XXreplace_meXX')
-      .with(
-        'content' => 'template(freeradius/home_server_pool.erb)',
-        'order'   => '20',
-        'target'  => '$::osfamily ? { RedHat => /etc/raddb, Debian => /etc/freeradius, default => /etc/raddb }/proxy.conf'
+    is_expected.to contain_concat__fragment('homeserverpool-$name').with(
+      target: '$::freeradius::params::fr_basepath/proxy.conf',
+      content: [],
+      order: '20',
     )
   end
+  
 end