diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-12-13 11:36:09 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-12-13 11:36:09 +0000 |
| commit | 47dc17bce2e59b403dffa9eacc8b146618dba2c2 (patch) | |
| tree | 544fda407b7df029b0dd122f949fd0dfe3ad9694 /spec/gitlab_shell_gitlab_shell_spec.rb | |
| parent | df89099ed954a6673bb8388ef74480940d40a759 (diff) | |
| download | gitlab-shell-47dc17bce2e59b403dffa9eacc8b146618dba2c2.tar.gz | |
Revert "Merge branch 'sh-bump-ruby-version' into 'master'"
This reverts merge request !257
Diffstat (limited to 'spec/gitlab_shell_gitlab_shell_spec.rb')
| -rw-r--r-- | spec/gitlab_shell_gitlab_shell_spec.rb | 8 |
1 files changed, 3 insertions, 5 deletions
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 |