Fix some failures

# Conflicts:
#	app/models/ci/build.rb

3 files changed, 23 insertions, 25 deletions

diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index 6035c880b10..0d7d90450c6 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -35,20 +35,20 @@ class Projects::BuildsController < Projects::ApplicationController
 
   def trace
     build.trace.read do |stream|
-      state = if stream.valid?
-        stream.limit
-        stream.html_with_state(state)
-      end
-
-      result = {
-        id: @build.id, status: @build.status, complete: @build.complete?
-      }
-
       respond_to do |format|
         format.json do
-          state = params[:state].presence
-          render json: .to_h.
-            merge!()
+          result = {
+            id: @build.id, status: @build.status, complete: @build.complete?
+          }
+
+          if stream.valid?
+            stream.limit
+            state = params[:state].presence
+            trace = stream.html_with_state(state)
+            result.merge!(trace.to_h)
+          end
+
+          render json: result
         end
       end
     end
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 1f16cd23ff9..62f66a71c38 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -231,9 +231,7 @@ module Ci
     end
 
     def update_coverage
-      coverage = trace.use do |trace_stream|
-        trace_stream.extract_coverage(coverage_regex)
-      end
+      coverage = trace.extract_coverage(coverage_regex)
       update_attributes(coverage: coverage) if coverage.present?
     end
 
@@ -437,6 +435,15 @@ module Ci
       end
     end
 
+    def hide_secrets(trace)
+      return unless trace
+
+      trace = trace.dup
+      Ci::MaskSecret.mask!(trace, project.runners_token) if project
+      Ci::MaskSecret.mask!(trace, token)
+      trace
+    end
+
     private
 
     def update_artifacts_size
@@ -510,15 +517,6 @@ module Ci
       pipeline.config_processor.build_attributes(name)
     end
 
-    def hide_secrets(trace)
-      return unless trace
-
-      trace = trace.dup
-      Ci::MaskSecret.mask!(trace, project.runners_token) if project
-      Ci::MaskSecret.mask!(trace, token)
-      trace
-    end
-
     def update_project_statistics
       return unless project
 
diff --git a/spec/lib/gitlab/ci/trace_reader_spec.rb b/spec/lib/gitlab/ci/trace_reader_spec.rb
index ff5551bf703..bec08bc2af0 100644
--- a/spec/lib/gitlab/ci/trace_reader_spec.rb
+++ b/spec/lib/gitlab/ci/trace_reader_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::Ci::TraceReader do
+describe Gitlab::Ci::Trace do
   let(:path) { __FILE__ }
   let(:lines) { File.readlines(path) }
   let(:bytesize) { lines.sum(&:bytesize) }