summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/git
diff options
context:
space:
mode:
authorRobin Bobbitt <ryehle@us.ibm.com>2017-09-11 22:50:12 -0400
committerRobin Bobbitt <ryehle@us.ibm.com>2017-09-21 09:13:00 -0400
commitfbe205f92f144185a12d5c05e5094e831c14913c (patch)
treec61ecd0a81c770fde286db7ed9684c72d8c8b2f8 /spec/lib/gitlab/git
parentcfccb2785fb8b98a013170aae4b931e9431739d1 (diff)
downloadgitlab-ce-fbe205f92f144185a12d5c05e5094e831c14913c.tar.gz
Display full pre-receive and post-receive hook output in GitLab UI
Diffstat (limited to 'spec/lib/gitlab/git')
-rw-r--r--spec/lib/gitlab/git/hook_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/lib/gitlab/git/hook_spec.rb b/spec/lib/gitlab/git/hook_spec.rb
index ea3e4680b1d..0ff4f3bd105 100644
--- a/spec/lib/gitlab/git/hook_spec.rb
+++ b/spec/lib/gitlab/git/hook_spec.rb
@@ -28,6 +28,7 @@ describe Gitlab::Git::Hook do
f.write(<<-HOOK)
echo 'regular message from the hook'
echo 'error message from the hook' 1>&2
+ echo 'error message from the hook line 2' 1>&2
exit 1
HOOK
end
@@ -73,7 +74,7 @@ describe Gitlab::Git::Hook do
status, errors = hook.trigger(gl_id, blank, blank, ref)
expect(status).to be false
- expect(errors).to eq("error message from the hook\n")
+ expect(errors).to eq("error message from the hook<br>error message from the hook line 2<br>")
end
end
end