From 47dc17bce2e59b403dffa9eacc8b146618dba2c2 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 13 Dec 2018 11:36:09 +0000 Subject: Revert "Merge branch 'sh-bump-ruby-version' into 'master'" This reverts merge request !257 --- spec/gitlab_shell_gitlab_shell_spec.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'spec/gitlab_shell_gitlab_shell_spec.rb') diff --git a/spec/gitlab_shell_gitlab_shell_spec.rb b/spec/gitlab_shell_gitlab_shell_spec.rb index e5342b7..9afeac8 100644 --- a/spec/gitlab_shell_gitlab_shell_spec.rb +++ b/spec/gitlab_shell_gitlab_shell_spec.rb @@ -1,5 +1,4 @@ require_relative 'spec_helper' -require 'open3' describe 'bin/gitlab-shell' do def original_root_path @@ -132,13 +131,12 @@ describe 'bin/gitlab-shell' do def run!(args) cmd = [ - 'SSH_CONNECTION=fake', gitlab_shell_path, args - ].flatten.join(' ') + ].flatten.compact - stdout, _stderr, status = Open3.capture3(cmd) + output = IO.popen({'SSH_CONNECTION' => 'fake'}, cmd, &:read) - [stdout, status] + [output, $?] end end -- cgit v1.2.1