Skip to content

Commit 04eca1f

Browse files
authored
Merge pull request #160 from glennsarti/fix-test
(maint) Fix integration test
2 parents 6a0540e + d03c4b1 commit 04eca1f

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

spec/languageserver-sidecar/integration/puppet-languageserver-sidecar/featureflag_puppetstrings/featureflag_puppetstrings_spec.rb

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@
44

55
describe 'PuppetLanguageServerSidecar with Feature Flag puppetstrings', :if => Gem::Version.new(Puppet.version) >= Gem::Version.new('6.0.0') do
66
def run_sidecar(cmd_options)
7+
# Use a new array so we don't affect the original cmd_options)
8+
cmd = cmd_options.dup
79
# Append the feature flag
8-
cmd_options << '--feature-flag=puppetstrings'
10+
cmd << '--feature-flag=puppetstrings'
911

1012
# Append the puppet test-fixtures
11-
cmd_options << '--puppet-settings'
12-
cmd_options << "--vardir,#{File.join($fixtures_dir, 'real_agent', 'cache')},--confdir,#{File.join($fixtures_dir, 'real_agent', 'confdir')}"
13+
cmd << '--puppet-settings'
14+
cmd << "--vardir,#{File.join($fixtures_dir, 'real_agent', 'cache')},--confdir,#{File.join($fixtures_dir, 'real_agent', 'confdir')}"
1315

14-
cmd = ['ruby', 'puppet-languageserver-sidecar'].concat(cmd_options)
16+
cmd.unshift('puppet-languageserver-sidecar')
17+
cmd.unshift('ruby')
1518
stdout, _stderr, status = Open3.capture3(*cmd)
1619

1720
raise "Expected exit code of 0, but got #{status.exitstatus} #{_stderr}" unless status.exitstatus.zero?

0 commit comments

Comments
 (0)