diff options
Diffstat (limited to 'spec/commands/exec_spec.rb')
-rw-r--r-- | spec/commands/exec_spec.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb index e2283d7aa4..8163fc7725 100644 --- a/spec/commands/exec_spec.rb +++ b/spec/commands/exec_spec.rb @@ -462,7 +462,8 @@ describe "bundle exec" do puts "EXEC: \#{caller.grep(/load/).empty? ? 'exec' : 'load'}" puts "ARGS: \#{$0} \#{ARGV.join(' ')}" puts "RACK: \#{RACK}" - puts "PROCESS: \#{`ps --no-headers -oargs -p\#{Process.pid}`.strip}" + process_title = `ps -o args -p \#{Process.pid}`.split("\n", 2).last.strip + puts "PROCESS: \#{process_title}" RUBY before do @@ -477,7 +478,11 @@ describe "bundle exec" do let(:exec) { "EXEC: load" } let(:args) { "ARGS: #{path} arg1 arg2" } let(:rack) { "RACK: 1.0.0" } - let(:process) { "PROCESS: #{path} arg1 arg2" } + let(:process) do + title = "PROCESS: #{path}" + title += " arg1 arg2" if RUBY_VERSION >= "2.1" + title + end let(:exit_code) { 0 } let(:expected) { [exec, args, rack, process].join("\n") } let(:expected_err) { "" } @@ -513,7 +518,7 @@ describe "bundle exec" do let(:exit_code) { 1 } let(:expected) { super() << "\nbundler: failed to load command: #{path} (#{path})" } let(:expected_err) do - "RuntimeError: ERROR\n #{path}:8" + + "RuntimeError: ERROR\n #{path}:10" + (Bundler.current_ruby.ruby_18? ? "" : ":in `<top (required)>'") end it_behaves_like "it runs" |