diff --git a/spec/classes/php_repo_ubuntu_spec.rb b/spec/classes/php_repo_ubuntu_spec.rb index 6650ab4..56b68a3 100644 --- a/spec/classes/php_repo_ubuntu_spec.rb +++ b/spec/classes/php_repo_ubuntu_spec.rb @@ -1,49 +1,49 @@ require 'spec_helper' describe 'php::repo::ubuntu', type: :class do on_supported_os.each do |os, facts| context "on #{os}" do let :facts do facts end case facts[:lsbdistcodename] when 'trusty' describe 'when called with no parameters on Ubuntu trusty' do it { is_expected.to contain_exec('add-apt-repository-ppa:ondrej/php') } end describe 'when called with version 7.0 on Ubuntu trusty' do let(:params) do { version: '7.0' } end it { is_expected.to contain_exec('add-apt-repository-ppa:ondrej/php') } end describe 'when call with version 5.6 on Ubuntu trusty' do let(:params) do { version: '5.6' } end it { is_expected.to contain_exec('add-apt-repository-ppa:ondrej/php') } end describe 'when call with version 5.4 on Ubuntu trusty' do let(:params) do { version: '5.4' } end - it { expect { is_expected.to raise_error(Puppet::Error) } } + it { is_expected.to raise_error(Puppet::Error) } end end end end end diff --git a/spec/defines/config_spec.rb b/spec/defines/config_spec.rb index e0c0c75..77976bb 100644 --- a/spec/defines/config_spec.rb +++ b/spec/defines/config_spec.rb @@ -1,114 +1,114 @@ require 'spec_helper' describe 'php::config' do on_supported_os.each do |os, facts| context "on #{os}" do let :facts do facts end case facts[:operatingsystem] when 'Ubuntu' context 'default config' do let(:title) { 'unique-name' } let(:params) do { file: '/etc/php/5.6/conf.d/unique-name.ini', config: {} } end it { is_expected.to compile } end context 'simple example' do let(:title) { 'unique-name' } let(:params) do { file: '/etc/php/5.6/conf.d/unique-name.ini', config: { 'apc.enabled' => 1 } } end it { is_expected.to contain_php__config('unique-name').with_file('/etc/php/5.6/conf.d/unique-name.ini') } end context 'empty array' do let(:title) { 'unique-name' } let(:params) do { file: '/etc/php/5.6/conf.d/unique-name.ini', config: {} } end it { is_expected.to contain_php__config('unique-name').with_file('/etc/php/5.6/conf.d/unique-name.ini') } end context 'invalid config (string)' do let(:title) { 'unique-name' } let(:params) do { file: '/etc/php/5.6/conf.d/unique-name.ini', config: 'hello world' } end - it { expect { is_expected.to raise_error(Puppet::Error) } } + it { is_expected.to raise_error(Puppet::Error) } end else context 'default config' do let(:title) { 'unique-name' } let(:params) do { file: '/etc/php5/conf.d/unique-name.ini', config: {} } end it { is_expected.to compile } end context 'simple example' do let(:title) { 'unique-name' } let(:params) do { file: '/etc/php5/conf.d/unique-name.ini', config: { 'apc.enabled' => 1 } } end it { is_expected.to contain_php__config('unique-name').with_file('/etc/php5/conf.d/unique-name.ini') } end context 'empty array' do let(:title) { 'unique-name' } let(:params) do { file: '/etc/php5/conf.d/unique-name.ini', config: {} } end it { is_expected.to contain_php__config('unique-name').with_file('/etc/php5/conf.d/unique-name.ini') } end context 'invalid config (string)' do let(:title) { 'unique-name' } let(:params) do { file: '/etc/php5/conf.d/unique-name.ini', config: 'hello world' } end - it { expect { is_expected.to raise_error(Puppet::Error) } } + it { is_expected.to raise_error(Puppet::Error) } end end end end end