Fix failures

3 files changed, 9 insertions, 13 deletions

diff --git a/lib/gitlab/ci/trace/stream.rb b/lib/gitlab/ci/trace/stream.rb
index 6463f131358..015a3ae13ba 100644
--- a/lib/gitlab/ci/trace/stream.rb
+++ b/lib/gitlab/ci/trace/stream.rb
@@ -72,7 +72,7 @@ module Gitlab
           match = ""
 
           stream.each_line do |line|
-            matches = line.scan(regex).last
+            matches = line.scan(regex)
             match = matches.last if matches.is_a?(Array)
           end
 
diff --git a/spec/features/projects/builds_spec.rb b/spec/features/projects/builds_spec.rb
index 4e5835956f7..22a37aca95b 100644
--- a/spec/features/projects/builds_spec.rb
+++ b/spec/features/projects/builds_spec.rb
@@ -440,14 +440,10 @@ feature 'Builds', :feature do
       end
 
       context 'when build has trace in DB' do
-        let(:paths) { }
-
-        before do
-          page.within('.js-build-sidebar') { click_link 'Raw' }
-        end
+        let(:paths) { [] }
 
         it 'sends the right headers' do
-          expect(page.status_code).to eq(404)
+          expect(page.status_code).not_to have_link('Raw')
         end
       end
     end
diff --git a/spec/lib/gitlab/ci/trace_spec.rb b/spec/lib/gitlab/ci/trace_spec.rb
index dd47cfbf66b..8276afe89f1 100644
--- a/spec/lib/gitlab/ci/trace_spec.rb
+++ b/spec/lib/gitlab/ci/trace_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Gitlab::Ci::Trace do
   let(:build) { create(:ci_build) }
-  let(:trace) { described_class.new(job) }
+  let(:trace) { described_class.new(build) }
 
   describe '#append' do
     subject { trace.html }
@@ -45,29 +45,29 @@ describe Gitlab::Ci::Trace do
     end
 
     context 'valid content & bad regex' do
-      let(:data) { 'Coverage 1033 / 1051 LOC (98.29%) covered' }
-      let(:regex) { 'very covered') }
+      let(:data) { 'Coverage 1033 / 1051 LOC (98.29%) covered\n' }
+      let(:regex) { 'very covered' }
 
       it { is_expected.to be_nil }
     end
 
     context 'no coverage content & regex' do
       let(:data) { 'No coverage for today :sad:' }
-      let(:regex) { '\(\d+.\d+\%\) covered') }
+      let(:regex) { '\(\d+.\d+\%\) covered' }
 
       it { is_expected.to be_nil }
     end
 
     context 'multiple results in content & regex' do
       let(:data) { ' (98.39%) covered. (98.29%) covered' }
-      let(:regex) { '\(\d+.\d+\%\) covered') }
+      let(:regex) { '\(\d+.\d+\%\) covered' }
 
       it { is_expected.to eq(98.29) }
     end
 
     context 'using a regex capture' do
       let(:data) { 'TOTAL      9926   3489    65%' }
-      let(:regex) { 'TOTAL\s+\d+\s+\d+\s+(\d{1,3}\%)') }
+      let(:regex) { 'TOTAL\s+\d+\s+\d+\s+(\d{1,3}\%)' }
 
       it { is_expected.to eq(65) }
     end