Skip to content

Commit

Permalink
Merge branch 'bugfix/enh-44-remove-spaces-before-arguments' into feat…
Browse files Browse the repository at this point in the history 
…ure/enh-45-add-puppet-rspec-tests
  • Loading branch information
@frodoslaw
frodoslaw committed Feb 4, 2016
2 parents 1d40fc7 + 85799c4 commit 19ca001
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 47 deletions.
8 changes: 7 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ addons:
packages:
- libaugeas-dev
- libxml2-dev
bundler_args: --without development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
bundler_args: "--without development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}"
cache: bundler
script: bundle exec rake test
before_install: rm -f Gemfile.lock
Expand Down Expand Up @@ -45,3 +45,9 @@ matrix:
# FIXME: GH Issue #3 - Activate acceptance tests on Travis CI for Puppet Enterprise, at least 2.8.8 and 3.8.2
notifications:
email: false
slack:
rooms:
secure: jKciSvj0RpuEcUSuEG4jXTsfWKo3sN1eYzdy9fdeO6ku7PCVkbLWunfrED7zEHGbfiiiAkdUoMqrgxQIz+iyEmS/kusa3/3II4J4NYcQE3jJz4+57ovfoMEJY1NWGofohW06NHkg+c9VwPKdtdUDWEcJ9jVvntXcPlMyJkoSk7I+EWyonyR/hzhDn8EjYGA+PQ+xdFAvBr1hN+1AFUGVwOub91Kv5UGjT6A/kqKx0uNUqF1raiizmpx2AZDixGnDRv2RpDDKjdUjA34RIHXxTrJvP4GIDInEho9Cnt11/OJtk7xm65wBS7vA3eCKse/QoPmbTpO21+HG0/pwKDujZL9mcbCGofRpfTtrDS5Fd0y3VxC3iyJN3fOUP9hxk3u+SZDWXFQAFVoR12LI9FMNSV5p4Kb0HoZ+6y7rk72ET0a76ubHu+r04pH14g8JTWi2ILI4DTvXOixmNZZIYbk8iodLUcxoubyIDcKkvaJ1MjXlEF3ZVg3+HYtk42xyir6uSKjA9OTHuHJkmxzSkjLaGh5SayhTTCf9FKiPcjztM2dHyZ18F0ZwCWAqmiMtSgKS9NkIBL1xJJWa8NAo8q5XOi1dlGUqLrQIxuA0aRoICxHjXF31hg7qRzzCZMM0MptNbkNxtxFtzg1n9tGQyepJBZyWJxvvk31N1sLHhdxFrDQ=
on_success: always
on_failure: always
on_start: always
2 changes: 1 addition & 1 deletion spec/classes/init_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
it { is_expected.to contain_anchor 'jboss::service::started' }
it { is_expected.to contain_user 'jboss' }
it { is_expected.to contain_group 'jboss' }
it { is_expected.to contain_class('jboss::internal::package').with ({
it { is_expected.to contain_class('jboss::internal::package').with({
:version => '8.2.0.Final',
:product => 'wildfly',
:jboss_user => 'jboss',
Expand Down
14 changes: 7 additions & 7 deletions spec/classes/internal/configure/interfaces_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@
it { is_expected.to contain_class 'jboss::params' }
it { is_expected.to contain_class 'jboss::internal::runtime::dc' }
it { is_expected.to contain_class 'jboss::internal::configure::interfaces' }
it { is_expected.to contain_jboss__interface('public').with ({
it { is_expected.to contain_jboss__interface('public').with({
:ensure => 'present',
:inet_address => nil
}) }
it { is_expected.to contain_augeas('ensure present interface public').with ({
it { is_expected.to contain_augeas('ensure present interface public').with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "set server/interfaces/interface[last()+1]/#attribute/name public",
:onlyif => "match server/interfaces/interface[#attribute/name='public'] size == 0"
}) }
it { is_expected.to contain_augeas('interface public set any-address').with ({
it { is_expected.to contain_augeas('interface public set any-address').with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "set server/interfaces/interface[#attribute/name='public']/any-address/#attribute/value 'true'",
:onlyif => "get server/interfaces/interface[#attribute/name='public']/any-address/#attribute/value != 'true'"
}) }
it { is_expected.to contain_jboss__internal__interface__foreach("public:any-address").with ({
it { is_expected.to contain_jboss__internal__interface__foreach("public:any-address").with({
:cfg_file => '/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml',
:path => 'server/interfaces'
}) }
Expand All @@ -44,17 +44,17 @@
it { is_expected.to contain_anchor("#{item}") }
end
bind_variables_list.each do |var|
it { is_expected.to contain_augeas("interface public rm #{var}").with ({
it { is_expected.to contain_augeas("interface public rm #{var}").with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "rm server/interfaces/interface[#attribute/name='public']/#{var}",
:onlyif => "match server/interfaces/interface[#attribute/name='public']/#{var} size != 0"
}) }
it { is_expected.to contain_jboss__internal__interface__foreach("public:#{var}").with ({
it { is_expected.to contain_jboss__internal__interface__foreach("public:#{var}").with({
:cfg_file => '/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml',
:path => 'server/interfaces'
}) }
end
it { is_expected.to contain_service('wildfly').with ({
it { is_expected.to contain_service('wildfly').with({
:ensure => 'running',
:enable => true
}) }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/internal/service_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
it { is_expected.to contain_augeas("interface public rm #{var}") }
it { is_expected.to contain_jboss__internal__interface__foreach("public:#{var}") }
end
it { is_expected.to contain_service('wildfly').with ({
it { is_expected.to contain_service('wildfly').with({
:ensure => 'running',
:enable => true
})}
Expand Down
18 changes: 9 additions & 9 deletions spec/defines/clientry_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

shared_examples 'completly working define' do
it { is_expected.to compile }
it { is_expected.to contain_jboss_confignode(title).with ({
it { is_expected.to contain_jboss_confignode(title).with({
:ensure => 'present',
:path => 'profile/test'
}) }
Expand All @@ -29,25 +29,25 @@
it { is_expected.to contain_class 'jboss::internal::runtime::dc' }
it { is_expected.to contain_class 'jboss::internal::configure::interfaces' }
it { is_expected.to contain_jboss_confignode(title).that_requires('Anchor[jboss::package::end]') }
it { is_expected.to contain_jboss__clientry(title).with ({
it { is_expected.to contain_jboss__clientry(title).with({
:ensure => 'present',
:path => 'profile/test',
}) }
it { is_expected.to contain_jboss__interface('public').with ({
it { is_expected.to contain_jboss__interface('public').with({
:ensure => 'present',
:inet_address => nil
}) }
it { is_expected.to contain_augeas('ensure present interface public').with ({
it { is_expected.to contain_augeas('ensure present interface public').with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "set server/interfaces/interface[last()+1]/#attribute/name public",
:onlyif => "match server/interfaces/interface[#attribute/name='public'] size == 0"
}) }
it { is_expected.to contain_augeas('interface public set any-address').with ({
it { is_expected.to contain_augeas('interface public set any-address').with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "set server/interfaces/interface[#attribute/name='public']/any-address/#attribute/value 'true'",
:onlyif => "get server/interfaces/interface[#attribute/name='public']/any-address/#attribute/value != 'true'"
}) }
it { is_expected.to contain_jboss__internal__interface__foreach("public:any-address").with ({
it { is_expected.to contain_jboss__internal__interface__foreach("public:any-address").with({
:cfg_file => '/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml',
:path => 'server/interfaces'
}) }
Expand All @@ -57,17 +57,17 @@
end

bind_variables_list.each do |var|
it { is_expected.to contain_augeas("interface public rm #{var}").with ({
it { is_expected.to contain_augeas("interface public rm #{var}").with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "rm server/interfaces/interface[#attribute/name='public']/#{var}",
:onlyif => "match server/interfaces/interface[#attribute/name='public']/#{var} size != 0"
}) }
it { is_expected.to contain_jboss__internal__interface__foreach("public:#{var}").with ({
it { is_expected.to contain_jboss__internal__interface__foreach("public:#{var}").with({
:cfg_file => '/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml',
:path => 'server/interfaces'
}) }
end
it { is_expected.to contain_service('wildfly').with ({
it { is_expected.to contain_service('wildfly').with({
:ensure => 'running',
:enable => true
}) }
Expand Down
18 changes: 9 additions & 9 deletions spec/defines/deploy_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@

shared_examples 'completly working define' do
it { is_expected.to compile }
it { is_expected.to contain_jboss__deploy(title).with ({
it { is_expected.to contain_jboss__deploy(title).with({
:ensure => 'present',
:path => '/tmp/jboss.war',
:servergroups => ''
}) }
it { is_expected.to contain_jboss_deploy(title).with ({
it { is_expected.to contain_jboss_deploy(title).with({
:ensure => 'present',
:source => '/tmp/jboss.war',
:redeploy => false
Expand All @@ -31,21 +31,21 @@
it { is_expected.to contain_group 'jboss' }
it { is_expected.to contain_class 'jboss::params' }
it {is_expected.to contain_class 'jboss::internal::runtime::node' }
it { is_expected.to contain_jboss__interface('public').with ({
it { is_expected.to contain_jboss__interface('public').with({
:ensure => 'present',
:inet_address => nil
}) }
it { is_expected.to contain_augeas('ensure present interface public').with ({
it { is_expected.to contain_augeas('ensure present interface public').with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "set server/interfaces/interface[last()+1]/#attribute/name public",
:onlyif => "match server/interfaces/interface[#attribute/name='public'] size == 0"
}) }
it { is_expected.to contain_augeas('interface public set any-address').with ({
it { is_expected.to contain_augeas('interface public set any-address').with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "set server/interfaces/interface[#attribute/name='public']/any-address/#attribute/value 'true'",
:onlyif => "get server/interfaces/interface[#attribute/name='public']/any-address/#attribute/value != 'true'"
}) }
it { is_expected.to contain_jboss__internal__interface__foreach("public:any-address").with ({
it { is_expected.to contain_jboss__internal__interface__foreach("public:any-address").with({
:cfg_file => '/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml',
:path => 'server/interfaces'
}) }
Expand All @@ -55,17 +55,17 @@
end

bind_variables_list.each do |var|
it { is_expected.to contain_augeas("interface public rm #{var}").with ({
it { is_expected.to contain_augeas("interface public rm #{var}").with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "rm server/interfaces/interface[#attribute/name='public']/#{var}",
:onlyif => "match server/interfaces/interface[#attribute/name='public']/#{var} size != 0"
}) }
it { is_expected.to contain_jboss__internal__interface__foreach("public:#{var}").with ({
it { is_expected.to contain_jboss__internal__interface__foreach("public:#{var}").with({
:cfg_file => '/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml',
:path => 'server/interfaces'
}) }
end
it { is_expected.to contain_service('wildfly').with ({
it { is_expected.to contain_service('wildfly').with({
:ensure => 'running',
:enable => true
}) }
Expand Down
2 changes: 1 addition & 1 deletion spec/defines/jmsqueue_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
describe 'jboss::jmsqueue', :type => :define do
shared_examples 'completly working define' do
it { is_expected.to compile }
it { is_expected.to contain_jboss_jmsqueue(title).with ({
it { is_expected.to contain_jboss_jmsqueue(title).with({
:ensure => 'present',
:entries => [
'queue/app-mails',
Expand Down
16 changes: 8 additions & 8 deletions spec/defines/module_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@
it { is_expected.to contain_user 'jboss' }
it { is_expected.to contain_group 'jboss' }
it { is_expected.to contain_class 'jboss::params' }
it { is_expected.to contain_jboss__internal__module__assemble(title).with ({
it { is_expected.to contain_jboss__internal__module__assemble(title).with({
:layer => 'jdbc',
:artifacts => ["https://jdbc.postgresql.org/download/postgresql-9.4-1204.jdbc41.jar"],
:dependencies => ["javax.transaction.api", "javax.api"]
})}

it { is_expected.to contain_jboss__module(title).with ({
it { is_expected.to contain_jboss__module(title).with({
:layer => 'jdbc',
:artifacts => ["https://jdbc.postgresql.org/download/postgresql-9.4-1204.jdbc41.jar"]
}) }
it { is_expected.to contain_jboss__interface('public').with ({
it { is_expected.to contain_jboss__interface('public').with({
:ensure => 'present',
:inet_address => nil
}) }
it { is_expected.to contain_augeas('ensure present interface public').with ({
it { is_expected.to contain_augeas('ensure present interface public').with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "set server/interfaces/interface[last()+1]/#attribute/name public",
:onlyif => "match server/interfaces/interface[#attribute/name='public'] size == 0"
Expand All @@ -42,23 +42,23 @@
it { is_expected.to contain_anchor("#{item}") }
end
bind_variables_list.each do |var|
it { is_expected.to contain_augeas("interface public rm #{var}").with ({
it { is_expected.to contain_augeas("interface public rm #{var}").with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "rm server/interfaces/interface[#attribute/name='public']/#{var}",
:onlyif => "match server/interfaces/interface[#attribute/name='public']/#{var} size != 0"
}) }
it { is_expected.to contain_jboss__internal__interface__foreach("public:#{var}").with ({
it { is_expected.to contain_jboss__internal__interface__foreach("public:#{var}").with({
:cfg_file => '/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml',
:path => 'server/interfaces'
}) }
end

it { is_expected.to contain_augeas('interface public set any-address').with ({
it { is_expected.to contain_augeas('interface public set any-address').with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "set server/interfaces/interface[#attribute/name='public']/any-address/#attribute/value 'true'",
:onlyif => "get server/interfaces/interface[#attribute/name='public']/any-address/#attribute/value != 'true'"
}) }
it { is_expected.to contain_jboss__internal__interface__foreach("public:any-address").with ({
it { is_expected.to contain_jboss__internal__interface__foreach("public:any-address").with({
:cfg_file => '/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml',
:path => 'server/interfaces'
}) }
Expand Down
18 changes: 9 additions & 9 deletions spec/defines/resourceadapter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

shared_examples 'completly working define' do
it { is_expected.to compile }
it { is_expected.to contain_jboss_resourceadapter(title).with ({
it { is_expected.to contain_jboss_resourceadapter(title).with({
:ensure => 'present',
:archive => 'jca-filestore.rar'
})}
Expand All @@ -26,28 +26,28 @@
it { is_expected.to contain_class 'jboss::params' }
it { is_expected.to contain_class 'jboss::internal::service' }
it { is_expected.to contain_class 'jboss::internal::runtime::node' }
it { is_expected.to contain_jboss__resourceadapter(title).with ({
it { is_expected.to contain_jboss__resourceadapter(title).with({
:ensure => 'present',
:archive => 'jca-filestore.rar',
:transactionsupport => 'LocalTransaction',
:classname => 'org.example.jca.FileSystemConnectionFactory',
}) }

it { is_expected.to contain_jboss__interface('public').with ({
it { is_expected.to contain_jboss__interface('public').with({
:ensure => 'present',
:inet_address => nil
}) }
it { is_expected.to contain_augeas('ensure present interface public').with ({
it { is_expected.to contain_augeas('ensure present interface public').with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "set server/interfaces/interface[last()+1]/#attribute/name public",
:onlyif => "match server/interfaces/interface[#attribute/name='public'] size == 0"
}) }
it { is_expected.to contain_augeas('interface public set any-address').with ({
it { is_expected.to contain_augeas('interface public set any-address').with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "set server/interfaces/interface[#attribute/name='public']/any-address/#attribute/value 'true'",
:onlyif => "get server/interfaces/interface[#attribute/name='public']/any-address/#attribute/value != 'true'"
}) }
it { is_expected.to contain_jboss__internal__interface__foreach("public:any-address").with ({
it { is_expected.to contain_jboss__internal__interface__foreach("public:any-address").with({
:cfg_file => '/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml',
:path => 'server/interfaces'
}) }
Expand All @@ -57,17 +57,17 @@
end

bind_variables_list.each do |var|
it { is_expected.to contain_augeas("interface public rm #{var}").with ({
it { is_expected.to contain_augeas("interface public rm #{var}").with({
:context => '/files/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml/',
:changes => "rm server/interfaces/interface[#attribute/name='public']/#{var}",
:onlyif => "match server/interfaces/interface[#attribute/name='public']/#{var} size != 0"
}) }
it { is_expected.to contain_jboss__internal__interface__foreach("public:#{var}").with ({
it { is_expected.to contain_jboss__internal__interface__foreach("public:#{var}").with({
:cfg_file => '/usr/lib/wildfly-8.2.0.Final/standalone/configuration/standalone-full.xml',
:path => 'server/interfaces'
}) }
end
it { is_expected.to contain_service('wildfly').with ({
it { is_expected.to contain_service('wildfly').with({
:ensure => 'running',
:enable => true
}) }
Expand Down
2 changes: 1 addition & 1 deletion spec/defines/securitydomain_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
it { is_expected.to contain_class 'jboss' }
it { is_expected.to contain_class 'jboss::internal::service' }
it { is_expected.to contain_class 'jboss::internal::runtime::node' }
it { is_expected.to contain_jboss_securitydomain(title).with ({
it { is_expected.to contain_jboss_securitydomain(title).with({
:ensure => 'present'
}) }
it { is_expected.to contain_jboss__securitydomain(title) }
Expand Down

0 comments on commit 19ca001

Please sign in to comment.