Merge pull request puppetlabs#15 from pdxcat/maint_add_missing_spec_t…

…ests

(#13073) Add missing puppet spec tests

Reviewed by Ryan Coleman (ryan@puppetlabs.com) -- Thanks for the contributions!

Rakefile

@@ -0,0 +1,14 @@
+require 'rake'
+
+task :default => [:spec]
+
+desc "Run all module spec tests (Requires rspec-puppet gem)"
+task :spec do
+  system("rspec spec")
+end
+
+desc "Build package"
+task :build do
+  system("puppet-module build")
+end
+

manifests/dev.pp

@@ -14,5 +14,8 @@
 class apache::dev {
   include apache::params
 
-  package{$apache::params::apache_dev: ensure => installed}
+  package { "apache_dev_package":
+    name => $apache::params::apache_dev,
+    ensure => installed
+  }
 }

manifests/init.pp

@@ -14,7 +14,7 @@
 #
 class apache {
   include apache::params
-  package { 'httpd': 
+  package { 'httpd':
     name   => $apache::params::apache_name,
     ensure => installed,
   }
@@ -25,7 +25,8 @@
     subscribe => Package['httpd'],
   }
 
-  file { $apache::params::vdir:
+  file { "httpd_vdir":
+    name => $apache::params::vdir,
     ensure  => directory,
     recurse => true,
     purge   => true,

manifests/php.pp

@@ -15,7 +15,8 @@
 class apache::php {
   include apache::params
 
-  package { $apache::params::php_package:
+  package { "apache_php_package":
+    name   => $apache::params::php_package,
     ensure => present,
   }
 }

manifests/python.pp

@@ -16,7 +16,8 @@
 	include apache::params
 	include apache
 
-  package { $apache::params::python_package:
+  package { "apache_python_package":
+    name   => $apache::params::python_package,
     ensure => present,
   }
 	a2mod { "python": ensure => present, }

manifests/ssl.pp

@@ -15,10 +15,12 @@
 class apache::ssl {
 
   include apache
-  
+
   case $operatingsystem {
      'centos', 'fedora', 'redhat', 'scientific': {
-        package { $apache::params::ssl_package:
+        package { "apache_ssl_package":
+           name    => "$apache::params::ssl_package",
+           ensure  => installed,
            require => Package['httpd'],
         }
      }

manifests/vhost.pp

@@ -65,8 +65,8 @@
     }
   }
 
-  file {
-    "${apache::params::vdir}/${priority}-${name}.conf":
+  file { "${priority}-${name}.conf":
+      name    => "${apache::params::vdir}/${priority}-${name}.conf",
       content => template($template),
       owner   => 'root',
       group   => 'root',

manifests/vhost/proxy.pp

@@ -3,9 +3,9 @@
 # Configures an apache vhost that will only proxy requests
 #
 # Parameters:
-# * $port: 
+# * $port:
 #     The port on which the vhost will respond
-# * $dest: 
+# * $dest:
 #     URI that the requests will be proxied for
 # - $priority
 # - $template -- the template to use for the vhost
@@ -31,13 +31,16 @@
 
   include apache
 
+  $apache_name = $apache::params::apache_name
+  $ssl_path = $apache::params::ssl_path
   $srvname = $name
 
   if $ssl == true {
     include apache::ssl
   }
 
-  file {"${apache::params::vdir}/${priority}-${name}":
+  file { "${priority}-${name}":
+    name    => "${apache::params::vdir}/${priority}-${name}",
     content => template($template),
     owner   => 'root',
     group   => 'root',

manifests/vhost/redirect.pp

@@ -29,7 +29,8 @@
 
   $srvname = $name
 
-  file {"${apache::params::vdir}/${priority}-${name}":
+  file { "${priority}-${name}":
+    name    => "${apache::params::vdir}/${priority}-${name}",
     content => template($template),
     owner   => 'root',
     group   => 'root',

spec/classes/apache_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe 'apache', :type => :class do
+
+  it { should include_class("apache::params") }
+
+  it { should contain_package("httpd") }
+
+  it { should contain_service("httpd").with(
+    'ensure'    => 'running',
+    'enable'    => 'true',
+    'subscribe' => 'Package[httpd]'
+    )
+  }
+
+  it { should contain_file("httpd_vdir").with(
+    'ensure'  => 'directory',
+    'recurse' => 'true',
+    'purge'   => 'true',
+    'notify'  => 'Service[httpd]',
+    'require' => 'Package[httpd]'
+    )
+  }
+end

spec/classes/dev_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe 'apache::dev', :type => :class do
+
+  it { should include_class("apache::params") }
+  it { should contain_package("apache_dev_package") }
+
+end

spec/classes/mod/python_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'apache::mod::python', :type => :class do
+
+  it { should include_class("apache") }
+
+  it { should contain_package("mod_python_package").with(
+   'ensure'  => 'installed',
+   'require' => 'Package[httpd]'
+    )
+  }
+
+  it { should contain_a2mod("python").with(
+   'ensure'  => 'present'
+    )
+  }
+
+end

spec/classes/mod/wsgi_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe 'apache::mod::wsgi', :type => :class do
+
+  it { should include_class("apache") }
+
+  it { should contain_package("mod_wsgi_package").with(
+   'require' => 'Package[httpd]'
+    )
+  }
+
+  it { should contain_a2mod("wsgi").with(
+   'ensure'  => 'present'
+    )
+  }
+
+end

spec/classes/params_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe 'apache::params', :type => :class do
+
+  it { should contain_apache__params }
+
+  # There are 4 resources in this class currently
+  # there should not be any more resources because it is a params class
+  # The resources are class[apache::params], class[main], class[settings], stage[main]
+  it "Should not contain any resources" do
+    subject.resources.size.should == 4
+  end
+end

spec/classes/php_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe 'apache::php', :type => :class do
+
+  it { should include_class("apache::params") }
+  it { should contain_package("apache_php_package") }
+
+end

spec/classes/python_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe 'apache::python', :type => :class do
+
+  it { should include_class("apache") }
+  it { should include_class("apache::params") }
+  it { should contain_package("apache_python_package") }
+  it { should contain_a2mod("python").with(
+   'ensure'  => 'present'
+    )
+  }
+
+end

spec/classes/ssl_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe 'apache::ssl', :type => :class do
+
+  it { should include_class("apache") }
+  it { should include_class("apache::params") }
+
+  describe "it should install the ssl package in redhat" do
+    let :facts do
+      { :operatingsystem => 'redhat' }
+    end
+
+    it { should contain_package("apache_ssl_package").with(
+        'ensure'  => 'installed'
+      )
+    }
+  end
+
+  describe "it should contain a2mod ssl in debian" do
+    let :facts do
+      { :operatingsystem => 'debian' }
+    end
+
+    it { should contain_a2mod("ssl").with(
+        'ensure'  => 'present'
+      )
+    }
+  end
+
+end

spec/defines/vhost/proxy_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe 'apache::vhost::proxy', :type => :define do
+
+  let :title do
+    'my_proxy_vhost'
+  end
+
+
+  let :default_params do
+    {
+      :port          => '80',
+      :dest          => 'example.com',
+      :priority      => '10',
+      :template      => "apache/vhost-proxy.conf.erb",
+      :servername    => '',
+      :serveraliases => '',
+      :ssl           => false,
+      :vhost_name    => '*'
+    }
+  end
+
+  [{
+      :dest          => 'example2.com',
+      :port          => '80',
+      :ssl           => true
+   },
+  ].each do |param_set|
+
+    describe "when #{param_set == {} ? "using default" : "specifying"} class parameters" do
+
+      let :param_hash do
+        default_params.merge(param_set)
+      end
+
+      let :params do
+        param_set
+      end
+
+      it { should include_class("apache") }
+      it { should contain_apache__params }
+
+      it {
+        if param_hash[:ssl]
+          should contain_apache__ssl
+        else
+          should_not contain_apache__ssl
+        end
+      }
+
+      it { should contain_file("#{param_hash[:priority]}-#{title}").with({
+          'owner'     => 'root',
+          'group'     => 'root',
+          'mode'      => '755',
+          'require'   => 'Package[httpd]',
+          'notify'    => 'Service[httpd]'
+        })
+      }
+    end
+  end
+end

spec/defines/vhost/redirect_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe 'apache::vhost::redirect', :type => :define do
+  let :title do
+    'my_vhost_redirect'
+  end
+
+
+  let :default_params do
+    {
+      :port          => '80',
+      :dest          => 'example.com',
+      :priority      => '10',
+      :template      => "apache/vhost-redirect.conf.erb",
+      :vhost_name    => '*'
+    }
+  end
+
+  [{
+      :dest          => 'example2.com',
+      :port          => '80',
+   },
+  ].each do |param_set|
+
+    describe "when #{param_set == {} ? "using default" : "specifying"} class parameters" do
+
+      let :param_hash do
+        default_params.merge(param_set)
+      end
+
+      let :params do
+        param_set
+      end
+
+      it { should include_class("apache") }
+      it { should contain_apache__params }
+
+      it { should contain_file("#{param_hash[:priority]}-#{title}").with({
+          'owner'     => 'root',
+          'group'     => 'root',
+          'mode'      => '755',
+          'require'   => 'Package[httpd]',
+          'notify'    => 'Service[httpd]'
+        })
+      }
+
+      # FIXME: Firewall is not actually realized anywhere
+      #it { should contain_firewall("0100-INPUT ACCEPT #{param_hash[:port]}").with( {
+      #    'jump' => 'Accept',
+      #    'dport'  => "#{param_hash[:port]}",
+      #    'proto'  => 'tcp'
+      #  })
+      #}
+    end
+  end
+end