diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-04-05 14:46:38 +0200 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-04-07 12:54:19 -0500 |
commit | c471f4452b6fe131bcf0f44a2bc414bc95e6b18e (patch) | |
tree | 6c03a45d3ec70cff6ec7209f74d765546c944e55 | |
parent | a74a3a9bf01e1a8833efe13e61141881f61e0f48 (diff) | |
download | gitlab-ce-c471f4452b6fe131bcf0f44a2bc414bc95e6b18e.tar.gz |
Fix some failures
-rw-r--r-- | lib/gitlab/ci/trace.rb | 8 | ||||
-rw-r--r-- | spec/lib/gitlab/ci/trace/stream_spec.rb | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb index 7c0f4a016e2..6a8f2b9f63b 100644 --- a/lib/gitlab/ci/trace.rb +++ b/lib/gitlab/ci/trace.rb @@ -13,15 +13,15 @@ module Gitlab current_path.present? || old_trace.present? end - def html(max_lines: nil) + def html(last_lines: nil) read do |stream| - stream.html(max_lines: max_lines) + stream.html(last_lines: last_lines) end end - def raw(max_lines: nil) + def raw(last_lines: nil) read do |stream| - stream.raw(max_lines: max_lines) + stream.raw(last_lines: last_lines) end end diff --git a/spec/lib/gitlab/ci/trace/stream_spec.rb b/spec/lib/gitlab/ci/trace/stream_spec.rb index 0fe149defc1..52014203f09 100644 --- a/spec/lib/gitlab/ci/trace/stream_spec.rb +++ b/spec/lib/gitlab/ci/trace/stream_spec.rb @@ -1,7 +1,6 @@ require 'spec_helper' describe Gitlab::Ci::Trace::Stream do - describe '#raw' do context 'limit max lines' do let(:path) { __FILE__ } @@ -45,7 +44,7 @@ describe Gitlab::Ci::Trace::Stream do it 'raises an error if not passing an integer for last_lines' do expect do - subject.raw(max_lines: lines) + subject.raw(last_lines: lines) end.to raise_error(ArgumentError) end |