Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP Is iconv extension idempotent ? #543

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

WIP Is iconv extension idempotent ? #543

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ca5ce96
REFACTOR separate tests: applies without error / applies idempotently
mfaure Oct 5, 2019
860fb22
STYLE Give more explicit name to tasks
mfaure Oct 5, 2019
d9af176
FIX Rubocop issues ont acceptance code
mfaure Oct 5, 2019
cc7628b
REFACTOR Reorganise logic of case on platforms
mfaure Oct 5, 2019
669ada0
CHORE Add 13 php extensions on Ubuntu 18.04 acceptance test
mfaure Oct 5, 2019
322739d
CHORE Lower from 13 to 6 extensions on Ubuntu 18.04 acceptance test
mfaure Oct 5, 2019
38b353f
CHORE Lower from 13 to 1 (more) extension on Ubuntu 18.04 acceptance …
mfaure Oct 6, 2019
23b227a
CHORE Get back to 6 extensions more
mfaure Oct 6, 2019
653855a
CHORE Acceptance: add php extension iconv
mfaure Oct 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 61 additions & 64 deletions spec/acceptance/php_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
require 'spec_helper_acceptance'

describe 'php with default settings' do
context 'default parameters' do
it 'works with defaults' do
pp = 'include php'
# Run it twice and test for idempotency
describe 'php class' do
context 'with default parameters' do
pp = 'include php'
it 'applies without error' do
apply_manifest(pp, catch_failures: true)
end
it 'applies idempotently' do
apply_manifest(pp, catch_changes: true)
end

Expand Down Expand Up @@ -34,71 +35,66 @@
it { is_expected.to be_enabled }
end
end
context 'default parameters with extensions' do
case default[:platform]
when %r{ubuntu-18.04}, %r{ubuntu-16.04}
it 'works with defaults' do
case default[:platform]
when %r{ubuntu-18.04}
simplexmlpackagename = 'php7.2-xml'
when %r{ubuntu-16.04}
simplexmlpackagename = 'php7.0-xml'
end
pp = <<-EOS
class{'php':
extensions => {
'mysql' => {},
'gd' => {},
'net-url' => {
package_prefix => 'php-',
settings => {
extension => undef
},
},
'simplexml' => {
package_name => '#{simplexmlpackagename}',
}
}
}
EOS
# Run it twice and test for idempotency
apply_manifest(pp, catch_failures: true)
apply_manifest(pp, catch_changes: true)
end
when %r{ubuntu-14.04}
it 'works with defaults' do
pp = <<-EOS
context 'with extensions' do
added_extensions = case default[:platform]
when %r{ubuntu-18.04}
<<-EOS
'bz2' => {},
'curl' => {},
'iconv' => {},
'intl' => {},
'json' => {},
'mbstring' => {},
'zip' => {},
'net-url' => {
package_prefix => 'php-',
settings => {
extension => undef
},
},
'simplexml' => {
package_name => 'php7.2-xml',
},
EOS
when %r{ubuntu-16.04}
<<-EOS
'net-url' => {
package_prefix => 'php-',
settings => {
extension => undef
},
},
'simplexml' => {
package_name => 'php7.0-xml',
},
EOS
when %r{ubuntu-14.04}
<<-EOS
'net-url' => {
package_prefix => 'php-',
settings => {
extension => undef
},
},
EOS
else
''
end

pp = <<-EOS
class{'php':
extensions => {
'mysql' => {},
'gd' => {},
'net-url' => {
package_prefix => 'php-',
settings => {
extension => undef
},
}
#{added_extensions}
}
}
EOS
# Run it twice and test for idempotency
apply_manifest(pp, catch_failures: true)
apply_manifest(pp, catch_changes: true)
end
else
it 'works with defaults' do
pp = <<-EOS
class{'php':
extensions => {
'mysql' => {},
'gd' => {}
}
}
EOS
# Run it twice and test for idempotency
apply_manifest(pp, catch_failures: true)
apply_manifest(pp, catch_changes: true)
end
EOS
it 'applies without error' do
apply_manifest(pp, catch_failures: true)
end
it 'applies idempotently' do
apply_manifest(pp, catch_changes: true)
end

case default[:platform]
Expand All @@ -117,6 +113,7 @@
when %r{debian-10}
packagename = 'php7.3-fpm'
end

describe package(packagename) do
it { is_expected.to be_installed }
end
Expand Down