From a0dab9241b3227a07da75fbe1d9d62af6d8bc153 Mon Sep 17 00:00:00 2001
From: Goran Miskovic <schkovich@gmail.com>
Date: Sun, 22 Feb 2015 01:21:37 +0100
Subject: [PATCH] Made parameter package_provider optional.

close  jippi/puppet-php#131
---
 manifests/fpm/package.pp                 | 2 +-
 spec/classes/fpm/php_fpm_package_spec.rb | 8 ++++++++
 spec/classes/fpm_spec.rb                 | 8 ++++++++
 spec/classes/php_spec.rb                 | 5 +++--
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 spec/classes/fpm/php_fpm_package_spec.rb
 create mode 100644 spec/classes/fpm_spec.rb

diff --git a/manifests/fpm/package.pp b/manifests/fpm/package.pp
index 870a7ad1..e5a9ceb8 100644
--- a/manifests/fpm/package.pp
+++ b/manifests/fpm/package.pp
@@ -5,7 +5,7 @@
 class php::fpm::package(
   $package_name,
   $package_ensure,
-  $package_provider
+  $package_provider = undef
 ) {
 
   package { $package_name:
diff --git a/spec/classes/fpm/php_fpm_package_spec.rb b/spec/classes/fpm/php_fpm_package_spec.rb
new file mode 100644
index 00000000..f9b3ed4d
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_package_spec.rb
@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe 'php::fpm::package', :type => :class do
+  context 'with package_name => php5-fpm' do
+    let(:params) { {:package_name => 'php5-fpm', :package_ensure => 'installed'} }
+    it { should contain_package('php5-fpm') }
+  end
+end
diff --git a/spec/classes/fpm_spec.rb b/spec/classes/fpm_spec.rb
new file mode 100644
index 00000000..51ab921c
--- /dev/null
+++ b/spec/classes/fpm_spec.rb
@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe 'php::fpm', :type => :class do
+  it { should contain_class('php::fpm::package') }
+  it { should contain_class('php::fpm::service').that_requires('Package[php5-fpm]') }
+  it { should contain_php__fpm__config('php-fpm').that_requires('Package[php5-fpm]') }
+  it { should contain_file('/etc/php5/fpm/php-fpm.conf').that_requires('Package[php5-fpm]') }
+end
diff --git a/spec/classes/php_spec.rb b/spec/classes/php_spec.rb
index 252034c2..7f9db1a4 100644
--- a/spec/classes/php_spec.rb
+++ b/spec/classes/php_spec.rb
@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe 'php', :type => :class do
-  it { should contain_class 'php' }
-  it { should include_class 'php::params' }
+  it { should compile.with_all_deps }
+  it { should contain_class('php') }
+  it { should contain_class('php::params') }
 end