puppet-retrospec 0.8.1 → 0.9.0

data/spec/fixtures/modules/tomcat/manifests/params.pp

@@ -0,0 +1,13 @@
+# Class: tomcat::params
+#
+# This class manages Tomcat parameters.
+#
+# Parameters:
+# - $catalina_home is the root of the Tomcat installation.
+# - The $user Tomcat runs as.
+# - The $group Tomcat runs as.
+class tomcat::params {
+  $catalina_home = '/opt/apache-tomcat'
+  $user          = 'tomcat'
+  $group         = 'tomcat'
+}

data/spec/fixtures/modules/tomcat/manifests/service.pp

@@ -0,0 +1,160 @@
+# Definition: tomcat::service
+#
+# Service management for Tomcat.
+#
+# Parameters:
+# - $catalina_home is the root of the Tomcat installation.
+# - $catalina_base is the base directory for the Tomcat installation.
+# - Whether or not to $use_jsvc for service management. Boolean defaulting to
+#   false. If both $use_jsvc and $use_init are false,
+#   $CATALINA_BASE/bin/catalina.sh start and $CATALIN/A_BASE/bin/catalina.sh
+#   stop are used for service management.
+# - If using jsvc, optionally set java_home.  Has no affect unless
+#   $use_jsvc = true.
+# - $service_ensure is passed on to the service resource.
+# - $service_enable specifies whether the tomcat service should be enabled on
+#   on boot. Valid options are 'true' or 'false'. Defaults to 'undef', will be
+#   programmatically set to 'true' if $use_init is true AND
+#   $service_ensure == 'running'
+# - Whether or not to $use_init for service management. Boolean defaulting to
+#   false. If both $use_jsvc and $use_init are false,
+#   $CATALINA_BASE/bin/catalina.sh start and $CATALIN/A_BASE/bin/catalina.sh
+#   stop are used for service management.
+# - The $service_name to use when $use_init is true.
+# - The $start_command to use for the service
+# - The $stop_command to use for the service
+define tomcat::service (
+  $catalina_home  = undef,
+  $catalina_base  = undef,
+  $use_jsvc       = false,
+  $java_home      = undef,
+  $service_ensure = running,
+  $service_enable = undef,
+  $use_init       = false,
+  $service_name   = undef,
+  $start_command  = undef,
+  $stop_command   = undef,
+) {
+
+  validate_bool($use_jsvc)
+  validate_bool($use_init)
+
+  if $use_jsvc and $use_init {
+    fail('Only one of $use_jsvc and $use_init can be set to true')
+  }
+
+  if $use_init and ! $service_name {
+    fail('$service_name must be specified when $use_init is set to true')
+  }
+
+  if $service_enable != undef and ! $use_init {
+    warning('$use_init must be set to true when $service_enable is set')
+  }
+
+  if $use_init and ($catalina_home or $catalina_base) {
+    warning('$catalina_home and $catalina_base have no affect when $use_init = true')
+  }
+
+  if $java_home and ! $use_jsvc {
+    warning('$java_home has no affect unless $use_jsvc = true')
+  }
+
+  if $java_home and $start_command {
+    warning('$java_home is used in the $start_command, so this may not work as planned')
+  }
+
+  if ! $catalina_home {
+    $_catalina_home = $::tomcat::catalina_home
+  } else {
+    $_catalina_home = $catalina_home
+  }
+
+  if ! $catalina_base {
+    $_catalina_base = $::tomcat::catalina_home
+  } else {
+    $_catalina_base = $catalina_base
+  }
+
+  if $use_jsvc {
+    if $java_home {
+      $_jsvc_home = "-home ${java_home} "
+    } else {
+      $_jsvc_home = undef
+    }
+    $_service_name = "tomcat-${name}"
+    $_hasstatus    = false
+    $_hasrestart   = false
+    $_start        = $start_command ? {
+      undef   => "export CATALINA_HOME=${_catalina_home}; export CATALINA_BASE=${_catalina_base};
+                 \$CATALINA_BASE/bin/jsvc \
+                   ${_jsvc_home}-user ${::tomcat::user} \
+                   -classpath \$CATALINA_BASE/bin/bootstrap.jar:\$CATALINA_BASE/bin/tomcat-juli.jar \
+                   -outfile \$CATALINA_BASE/logs/catalina.out \
+                   -errfile \$CATALINA_BASE/logs/catalina.err \
+                   -pidfile \$CATALINA_BASE/logs/jsvc.pid \
+                   -Dcatalina.home=\$CATALINA_HOME \
+                   -Dcatalina.base=\$CATALINA_BASE \
+                   -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
+                   -Djava.util.logging.config.file=\$CATALINA_BASE/conf/logging.properties \
+                   org.apache.catalina.startup.Bootstrap",
+      default => $start_command,
+    }
+    $_stop         = $stop_command ? {
+      undef   => "export CATALINA_HOME=${_catalina_home}; export CATALINA_BASE=${_catalina_base};
+                 \$CATALINA_BASE/bin/jsvc \
+                   -pidfile \$CATALINA_BASE/logs/jsvc.pid \
+                   -stop org.apache.catalina.startup.Bootstrap",
+      default => $stop_command,
+    }
+    $_status       = "ps p `cat ${_catalina_base}/logs/jsvc.pid` > /dev/null"
+    $_provider     = 'base'
+  } elsif $use_init {
+    $_service_name = $service_name
+    $_hasstatus    = true
+    $_hasrestart   = true
+    $_start        = $start_command
+    $_stop         = $stop_command
+    $_status       = undef
+    $_provider     = undef
+  } else {
+    $_service_name = "tomcat-${name}"
+    $_hasstatus    = false
+    $_hasrestart   = false
+    $_start        = $start_command ? {
+      undef   => "su -s /bin/bash -c '${_catalina_base}/bin/catalina.sh start' ${::tomcat::user}",
+      default => $start_command
+    }
+    $_stop         = $stop_command ? {
+      undef   => "su -s /bin/bash -c '${_catalina_base}/bin/catalina.sh stop' ${::tomcat::user}",
+      default => $stop_command
+    }
+    $_status       = "ps aux | grep 'catalina.base=${_catalina_base} ' | grep -v grep"
+    $_provider     = 'base'
+  }
+
+  if $use_init {
+    if $service_enable != undef {
+      validate_bool($service_enable)
+      $_service_enable = $service_enable
+    } else {
+      $_service_enable = $service_ensure ? {
+        'running' => true,
+        true      => true,
+        default   => undef,
+      }
+    }
+  } else {
+    $_service_enable = undef
+  }
+
+  service { $_service_name:
+    ensure     => $service_ensure,
+    enable     => $_service_enable,
+    hasstatus  => $_hasstatus,
+    hasrestart => $_hasrestart,
+    start      => $_start,
+    stop       => $_stop,
+    status     => $_status,
+    provider   => $_provider,
+  }
+}

data/spec/fixtures/modules/tomcat/manifests/setenv/entry.pp

@@ -0,0 +1,52 @@
+# Definition tomcat::setenv::entry
+#
+# This define adds an entry to the setenv.sh script.
+#
+# Parameters:
+# - $value is the value of the parameter you're setting
+# - $ensure whether the fragment should be present or absent.
+# - $config_file is the path to the config file to edit
+# - $param is the parameter you're setting. Defaults to $name.
+# - $quote_char is the optional character to quote the value with.
+# - $order is the optional order to the param in the file. Defaults to 10
+# - (Deprecated) $base_path is the path to create the setenv.sh script under. Should be
+#   either $catalina_base/bin or $catalina_home/bin.
+define tomcat::setenv::entry (
+  $value,
+  $ensure      = 'present',
+  $config_file = "${::tomcat::catalina_home}/bin/setenv.sh",
+  $param       = $name,
+  $quote_char  = undef,
+  # Deprecated
+  $base_path   = undef,
+  $order       = 10,
+) {
+
+  if $base_path {
+    warning('The $base_path parameter is deprecated; please use $config_file instead')
+    $_config_file = "${base_path}/setenv.sh"
+  } else {
+    $_config_file = $config_file
+  }
+
+  if ! $quote_char {
+    $_quote_char = ''
+  } else {
+    $_quote_char = $quote_char
+  }
+
+  if ! defined(Concat[$_config_file]) {
+    concat { $_config_file:
+      owner          => $::tomcat::user,
+      group          => $::tomcat::group,
+      ensure_newline => true,
+    }
+  }
+
+  concat::fragment { "setenv-${name}":
+    ensure  => $ensure,
+    target  => $_config_file,
+    content => inline_template('export <%= @param %>=<%= @_quote_char %><%= Array(@value).join(" ") %><%= @_quote_char %>'),
+    order   => $order,
+  }
+}

data/spec/fixtures/modules/tomcat/manifests/war.pp

@@ -0,0 +1,80 @@
+# Definition: tomcat::war
+#
+# Manage deployment of WAR files.
+#
+# Parameters:
+# - $catalina_base is the base directory for the Tomcat installation
+# - $app_base is the path relative to $catalina_base to deploy the WAR to.
+#   Defaults to 'webapps'.
+# - The $deployment_path can optionally be specified. Only one of $app_base and
+#   $deployment_path can be specified.
+# - $war_ensure specifies whether you are trying to add or remove the WAR.
+#   Valid values are 'present', 'absent', 'true', and 'false'. Defaults to
+#   'present'.
+# _ Optionally specify a $war_name. Defaults to $name.
+# - $war_purge is a boolean specifying whether or not to purge the exploded WAR
+#   directory. Defaults to true. Only applicable when $war_ensure is 'absent'
+#   or 'false'. Note: if tomcat is running and autodeploy is on, setting
+#   $war_purge to false won't stop tomcat from auto-undeploying exploded WARs.
+# - $war_source is the source to deploy the WAR from. Currently supports
+#   http(s)://, puppet://, and ftp:// paths. $war_source must be specified
+#   unless $war_ensure is set to 'false' or 'absent'.
+define tomcat::war(
+  $catalina_base   = $::tomcat::catalina_home,
+  $app_base        = undef,
+  $deployment_path = undef,
+  $war_ensure      = 'present',
+  $war_name        = undef,
+  $war_purge       = true,
+  $war_source      = undef,
+) {
+  validate_re($war_ensure, '^(present|absent|true|false)$')
+  validate_bool($war_purge)
+
+  if $app_base and $deployment_path {
+    fail('Only one of $app_base and $deployment_path can be specified.')
+  }
+
+  if $war_name {
+    $_war_name = $war_name
+  } else {
+    $_war_name = $name
+  }
+
+  validate_re($_war_name, '\.war$')
+
+  if $deployment_path {
+    $_deployment_path = $deployment_path
+  } else {
+    if $app_base {
+      $_app_base = $app_base
+    } else {
+      $_app_base = 'webapps'
+    }
+    $_deployment_path = "${catalina_base}/${_app_base}"
+  }
+
+  if $war_ensure =~ /^(absent|false)$/ {
+    file { "${_deployment_path}/${_war_name}":
+      ensure => absent,
+      force  => false,
+    }
+    if $war_purge {
+      $war_dir_name = regsubst($_war_name, '\.war$', '')
+      if $war_dir_name != '' {
+        file { "${_deployment_path}/${war_dir_name}":
+          ensure => absent,
+          force  => true
+        }
+      }
+    }
+  } else {
+    if ! $war_source {
+      fail('$war_source must be specified if you aren\'t removing the WAR')
+    }
+    staging::file { $name:
+      source => $war_source,
+      target => "${_deployment_path}/${_war_name}",
+    }
+  }
+}

data/spec/fixtures/modules/tomcat/metadata.json

@@ -0,0 +1,74 @@
+{
+  "name": "puppetlabs-tomcat",
+  "version": "1.3.0",
+  "author": "puppetlabs",
+  "summary": "Installs, deploys, and configures Apache Tomcat web services.",
+  "license": "Apache 2.0",
+  "source": "http://github.com/puppetlabs/puppetlabs-tomcat",
+  "project_page": "https://github.com/puppetlabs/puppetlabs-tomcat",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "dependencies": [
+    {"name":"puppetlabs/stdlib","version_requirement":">= 4.2.0 < 5.0.0"},
+    {"name":"puppetlabs/concat","version_requirement":">= 1.0.4 < 2.0.0"},
+    {"name":"nanliu/staging","version_requirement":">= 0.4.1 < 2.0.0"}
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "OracleLinux",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Scientific",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Ubuntu",
+      "operatingsystemrelease": [
+        "10.04",
+        "12.04",
+        "14.04"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": ">= 3.3.0 < 4.0.0"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": "3.x"
+    }
+  ]
+}

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'retrospec'
+require 'retrospec-puppet'
 require 'rspec'
 require 'puppet'
 require 'pry'

data/spec/unit/plugin_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'retrospec'
+
+describe "puppet" do
+  let(:plugin) do
+    Retrospec::Plugins::V1::Puppet.new('/tmp/testplugin_dir', {:name => 'testplugin', :config1 => 'test'})
+  end
+
+  it 'can show the version' do
+    expect(Retrospec::Puppet::VERSION).to eq('0.9.0')
+  end
+
+  it 'can get cli options' do
+    expect(Retrospec::Plugins::V1::Puppet.cli_options({})[:enable_future_parser]).to be false
+  end
+
+
+  it 'can get cli options' do
+    expect(Retrospec::Plugins::V1::Puppet.cli_options({'plugins::puppet::enable_future_parser' => true})[:enable_future_parser]).to be true
+  end
+end

data/spec/unit/puppet-retrospec_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
-require 'retrospec'
 require 'fakefs/safe'
-require 'retrospec/helpers'
 
 describe "puppet-retrospec" do
   after :all do
@@ -23,19 +21,19 @@ describe "puppet-retrospec" do
   end
 
   it 'should run without errors using new' do
-    tomcat = Retrospec.new(@opts[:module_path], @opts)
-    expect(tomcat).to be_instance_of(Retrospec)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
+    expect(tomcat).to be_instance_of(Retrospec::Plugins::V1::Puppet)
   end
 
   it 'should set the parser to future' do
     opts = {:module_path => @path, :enable_beaker_tests => false,
             :enable_user_templates => false, :template_dir => nil, :enable_future_parser => true }
-    tomcat = Retrospec.new(opts[:module_path], opts)
-    expect(tomcat.spec_object.instance.future_parser).to eq(true)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(opts[:module_path], opts)
+    expect(tomcat.context.instance.future_parser).to eq(true)
   end
 
   it 'should create files without error' do
-    tomcat = Retrospec.new(@opts[:module_path], @opts)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
     tomcat.create_files
     expect(File.exists?(File.join(@path, 'Gemfile'))).to eq(true)
     expect(File.exists?(File.join(@path, 'Rakefile'))).to eq(true)
@@ -48,7 +46,7 @@ describe "puppet-retrospec" do
 
   it 'should create acceptance test files' do
     @opts[:enable_beaker_tests] = true
-    tomcat = Retrospec.new(@opts[:module_path], @opts)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
     spec_path = File.expand_path(File.join(@path, 'spec'))
     tomcat.create_files
     expect(File.exists?(File.join(spec_path, 'spec_helper_acceptance.rb'))).to eq(true)
@@ -62,7 +60,7 @@ describe "puppet-retrospec" do
   it 'should not create acceptance test files' do
     clean_up_spec_dir(@path)
     @opts[:enable_beaker_tests] = false
-    tomcat = Retrospec.new(@opts[:module_path], @opts)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
     spec_path = File.expand_path(File.join(@path, 'spec'))
     tomcat.create_files
     expect(File.exists?(File.join(spec_path, 'spec_helper_acceptance.rb'))).to eq(false)
@@ -73,7 +71,7 @@ describe "puppet-retrospec" do
   end
 
   it 'should create proper spec helper file' do
-    tomcat = Retrospec.new(@opts[:module_path], @opts)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
     filepath = File.expand_path(File.join(@path, 'spec', 'spec_helper.rb'))
     tomcat.safe_create_module_files
     path = tomcat.module_path
@@ -81,19 +79,18 @@ describe "puppet-retrospec" do
   end
 
   it 'should create proper shared context file' do
-    tomcat = Retrospec.new(@opts[:module_path], @opts)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
     filepath = File.expand_path(File.join(@path, 'spec', 'shared_contexts.rb'))
     tomcat.safe_create_module_files
     expect(File.exists?(filepath)).to eq(true)
   end
 
   it 'should produce hiera data' do
-    tomcat = Retrospec.new(@opts[:module_path], @opts)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
     filepath = File.expand_path(File.join(@path, 'spec', 'shared_contexts.rb'))
     tomcat.safe_create_module_files
     path = tomcat.module_path
-    require 'pry'
-    expect(tomcat.spec_object.all_hiera_data).to eq({"tomcat::catalina_home"=>nil,
+    expect(tomcat.context.all_hiera_data).to eq({"tomcat::catalina_home"=>nil,
                                                  "tomcat::user"=>nil,
                                                  "tomcat::group"=>nil,
                                                  "tomcat::install_from_source"=>nil,
@@ -109,7 +106,7 @@ describe "puppet-retrospec" do
   it 'should create acceptance spec helper file' do
     opts = {:module_path => @path, :enable_beaker_tests => true,
              :template_dir => '/tmp/my_templates' }
-    tomcat = Retrospec.new(@opts[:module_path], opts)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], opts)
     filepath = File.expand_path(File.join(@path, 'spec', 'spec_helper_acceptance.rb'))
     tomcat.safe_create_module_files
     expect(File.exists?(filepath)).to eq(true)
@@ -119,7 +116,7 @@ describe "puppet-retrospec" do
     opts = {:module_path => @path, :enable_beaker_tests => false,
              :template_dir => '/tmp/my_templates' }
     filepath = File.expand_path(File.join(@path, 'spec', 'spec_helper_acceptance.rb'))
-    tomcat = Retrospec.new(@opts[:module_path], opts)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], opts)
     tomcat.safe_create_module_files
     expect(File.exists?(filepath)).to eq(false)
   end
@@ -127,7 +124,7 @@ describe "puppet-retrospec" do
   it 'should create 15 nodesets' do
     opts = {:module_path => @path, :enable_beaker_tests => true,
             :template_dir =>  '/tmp/my_templates' }
-    tomcat = Retrospec.new(@opts[:module_path], opts)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], opts)
     filepath = File.expand_path(File.join(@path, 'spec', 'acceptance', 'nodesets', 'default.yml'))
     tomcat.safe_create_module_files
     expect(File.exists?(filepath)).to eq(true)
@@ -135,14 +132,14 @@ describe "puppet-retrospec" do
   end
 
   it 'should create Gemfile file' do
-    tomcat = Retrospec.new(@opts[:module_path], @opts)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
     filepath = File.expand_path(File.join(@path, 'Gemfile'))
     tomcat.safe_create_module_files
     expect(File.exists?(filepath)).to eq(true)
   end
 
   it 'should create Rakefile file' do
-    tomcat = Retrospec.new(@opts[:module_path], @opts)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
     filepath = File.expand_path(File.join(@path, 'Rakefile'))
     tomcat.safe_create_module_files
     expect(File.exists?(filepath)).to eq(true)
@@ -151,22 +148,22 @@ describe "puppet-retrospec" do
   it 'should create proper fixtures file' do
     filepath = File.expand_path(File.join(@path,'.fixtures.yml'))
     FileUtils.rm_f(filepath)  # ensure we have a clean state
-    tomcat = Retrospec.new(@opts[:module_path], @opts)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
     tomcat.safe_create_module_files
     expect(File.exists?(filepath)).to eq(true)
   end
 
   it 'should not create any files when 0 resources exists' do
     my_path = File.expand_path(File.join('spec', 'fixtures', 'fixture_modules', 'zero_resource_module'))
-    my_retro = Retrospec.new(my_path)
-    Helpers.should_not_receive(:safe_create_file).with(anything,'resource_spec_file.erb')
+    my_retro = Retrospec::Plugins::V1::Puppet.new(my_path)
+    my_retro.should_not_receive(:safe_create_file).with(anything,'resource_spec_file.erb')
   end
 
   it 'should create a file from a template' do
-    tomcat = Retrospec.new(@opts[:module_path], @opts)
+    tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
     file_path = File.join(@path,'.fixtures.yml')
     template_file = File.join(tomcat.template_dir,'module_files','.fixtures.yml')
-    tomcat.safe_create_template_file(file_path, template_file)
+    tomcat.safe_create_template_file(file_path, template_file, tomcat.context)
     expect(File.exists?(file_path)).to eq(true)
   end
 
@@ -177,14 +174,14 @@ describe "puppet-retrospec" do
         type = double("type")
         allow(type).to receive(:type).and_return(:hostclass)
         allow(type).to receive(:name).and_return('tomcat::config::server::connector')
-        tomcat = Retrospec.new(@opts[:module_path], @opts)
+        tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
         expect(tomcat.generate_file_path(type, true)).to eq("spec/acceptance/classes/config/server/connector_spec.rb")
       end
       it 'should generate a normal test path correctly' do
         type = double("type")
         allow(type).to receive(:type).and_return(:hostclass)
         allow(type).to receive(:name).and_return('tomcat::config::server::connector')
-        tomcat = Retrospec.new(@opts[:module_path], @opts)
+        tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
         expect(tomcat.generate_file_path(type, false)).to eq("spec/classes/config/server/connector_spec.rb")
       end
     end
@@ -194,7 +191,7 @@ describe "puppet-retrospec" do
         type = double("type")
         allow(type).to receive(:type).and_return(:definition)
         allow(type).to receive(:name).and_return('tomcat::config::server::connector')
-        tomcat = Retrospec.new(@opts[:module_path], @opts)
+        tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
         expect(tomcat.generate_file_path(type, true)).to eq("spec/acceptance/defines/config/server/connector_spec.rb")
       end
 
@@ -202,14 +199,24 @@ describe "puppet-retrospec" do
         type = double("type")
         allow(type).to receive(:type).and_return(:definition)
         allow(type).to receive(:name).and_return('tomcat::config::server::connector')
-        tomcat = Retrospec.new(@opts[:module_path], @opts)
+        tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
         expect(tomcat.generate_file_path(type, false)).to eq("spec/defines/config/server/connector_spec.rb")
       end
     end
+
+    describe 'nodes' do
+      it 'should generate a normal test path correctly' do
+        type = double("type")
+        allow(type).to receive(:type).and_return(:node)
+        allow(type).to receive(:name).and_return('server1.example.com')
+        tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
+        expect(tomcat.generate_file_path(type, true)).to eq("spec/acceptance/hosts/server1.example.com_spec.rb")
+      end
+    end
   end
 
   it 'should generate a test file name correctly' do
-     tomcat = Retrospec.new(@opts[:module_path], @opts)
+     tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], @opts)
      expect(tomcat.generate_file_name('tomcat::config::server::connector')).to eq('connector_spec.rb')
      expect(tomcat.generate_file_name('tomcat')).to eq('tomcat_spec.rb')
      expect(tomcat.generate_file_name('tomcat::config')).to eq('config_spec.rb')