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

Clean up acceptance tests to minimize the spec helper #1401

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+231 −265
Open

Clean up acceptance tests to minimize the spec helper #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6ad919
Extract acceptance node setup to its own file
ekohl Feb 15, 2023
2ec48bf
Avoid monkey patching String to provide unindent
ekohl Feb 15, 2023
c602c88
Rely on Shellwords.shellescape to escape
ekohl Feb 15, 2023
8090f54
Inline pre_run method that's only used once
ekohl Aug 29, 2023
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
4 changes: 2 additions & 2 deletions spec/acceptance/postgresql_psql_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class { 'postgresql::server': } ->
idempotent_apply(pp_five)
end

pp_six = <<-MANIFEST.unindent
pp_six = <<~MANIFEST
class { 'postgresql::server': } ->
notify { 'trigger': } ~>
postgresql_psql { 'foobar':
Expand All @@ -89,7 +89,7 @@ class { 'postgresql::server': } ->
apply_manifest(pp_six, expect_changes: true)
end

pp_seven = <<-MANIFEST.unindent
pp_seven = <<~MANIFEST
class { 'postgresql::server': } ->
notify { 'trigger': } ~>
postgresql_psql { 'foobar':
Expand Down
10 changes: 5 additions & 5 deletions spec/acceptance/server/default_privileges_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
end

let(:pp_one) do
<<-MANIFEST.unindent
<<~MANIFEST
$db = #{db}
$user = #{user}
$group = #{group}
Expand Down Expand Up @@ -76,7 +76,7 @@ class { 'postgresql::server': }
end

let(:pp_target_role) do
<<-MANIFEST.unindent
<<~MANIFEST
$db = #{db}
$user = #{user}
$group = #{group}
Expand Down Expand Up @@ -121,7 +121,7 @@ class { 'postgresql::server': }
end

let(:pp_target_role_revoke) do
<<-MANIFEST.unindent
<<~MANIFEST
$db = #{db}
$user = #{user}
$group = #{group}
Expand Down Expand Up @@ -172,7 +172,7 @@ class { 'postgresql::server': }
end

let(:pp_schema) do
<<-MANIFEST.unindent
<<~MANIFEST
$db = #{db}
$user = #{user}
$group = #{group}
Expand Down Expand Up @@ -233,7 +233,7 @@ class { 'postgresql::server': }
end

let(:pp_unset_schema) do
<<-MANIFEST.unindent
<<~MANIFEST
$db = #{db}
$user = #{user}
$group = #{group}
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/server/deferred_pw_role_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
let(:password) { 'test_password' }

let(:pp_one) do
<<-MANIFEST.unindent
<<~MANIFEST
$user = #{user}
$password = #{password}

Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/server/grant_role_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'8.1' if os[:family] == 'redhat' && os[:release].start_with?('5')
end
let(:pp_one) do
<<-MANIFEST.unindent
<<~MANIFEST
$db = #{db}
$user = #{user}
$group = #{group}
Expand Down
Loading