diff --git a/test/integration/default/controls/command_spec.rb b/test/integration/default/controls/command_spec.rb index 7e6eea3..b68a47d 100644 --- a/test/integration/default/controls/command_spec.rb +++ b/test/integration/default/controls/command_spec.rb @@ -1,14 +1,14 @@ +# frozen_string_literal: true + # Overide by Platform pg_port = '5432' -if platform[:family] == 'debian' or platform[:family] == 'suse' - pg_port = '5433' -end +pg_port = '5433' if (platform[:family] == 'debian') || (platform[:family] == 'suse') control 'Postgres command' do title 'should match desired lines' # Can't use `%Q` here due to the `\` - describe command(%q{su - postgres -c 'psql -p} + pg_port + %q{ -qtc "\l+ db2"'}) do - its(:stdout) { should match(%r{db2.*remoteUser.*UTF8.*en_US.UTF-8.*en_US.UTF-8.*my_space}) } + describe command("su - postgres -c 'psql -p" + pg_port + %q( -qtc "\l+ db2"')) do + its(:stdout) { should match(/db2.*remoteUser.*UTF8.*en_US.UTF-8.*en_US.UTF-8.*my_space/) } end end diff --git a/test/integration/default/controls/config_spec.rb b/test/integration/default/controls/config_spec.rb index dc61924..476ee6b 100644 --- a/test/integration/default/controls/config_spec.rb +++ b/test/integration/default/controls/config_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + control 'Postgres configuration' do title 'should include the directory' diff --git a/test/integration/default/controls/services_spec.rb b/test/integration/default/controls/services_spec.rb index b2bfe97..5dfd78e 100644 --- a/test/integration/default/controls/services_spec.rb +++ b/test/integration/default/controls/services_spec.rb @@ -1,9 +1,11 @@ +# frozen_string_literal: true + # Overide by Platform service_name = 'postgresql' pg_port = 5432 -if platform[:name] == 'centos' and platform[:release].start_with?('6') +if (platform[:name] == 'centos') && platform[:release].start_with?('6') service_name = 'postgresql-9.6' -elsif platform[:family] == 'debian' or platform[:family] == 'suse' +elsif (platform[:family] == 'debian') || (platform[:family] == 'suse') pg_port = 5433 end