Fix outstanding test failures

6 files changed, 12 insertions, 91 deletions

diff --git a/features/steps/project/builds/summary.rb b/features/steps/project/builds/summary.rb
index 19ff92f6dc6..124582de6b9 100644
--- a/features/steps/project/builds/summary.rb
+++ b/features/steps/project/builds/summary.rb
@@ -22,9 +22,9 @@ class Spinach::Features::ProjectBuildsSummary < Spinach::FeatureSteps
   end
 
   step 'recent build has been erased' do
+    expect(@build).not_to have_trace
     expect(@build.artifacts_file.exists?).to be_falsy
     expect(@build.artifacts_metadata.exists?).to be_falsy
-    expect(@build.trace).to be_empty
   end
 
   step 'recent build summary does not have artifacts widget' do
diff --git a/spec/features/projects/builds_spec.rb b/spec/features/projects/builds_spec.rb
index 22a37aca95b..ab10434e10c 100644
--- a/spec/features/projects/builds_spec.rb
+++ b/spec/features/projects/builds_spec.rb
@@ -212,16 +212,6 @@ feature 'Builds', :feature do
           expect(page).to have_content 'BUILD TRACE and more trace'
         end
       end
-
-      context 'when build does not have an initial trace' do
-        let(:build) { create(:ci_build, pipeline: pipeline) }
-
-        it 'loads new trace' do
-          build.append_trace('build trace', 0)
-
-          expect(page).to have_content 'build trace'
-        end
-      end
     end
 
     feature 'Variables' do
@@ -424,9 +414,9 @@ feature 'Builds', :feature do
       end
 
       context 'when build has trace in file' do
-        let(:paths) {
+        let(:paths) do
           [existing_file]
-        }
+        end
 
         before do
           page.within('.js-build-sidebar') { click_link 'Raw' }
diff --git a/spec/javascripts/build_spec.js b/spec/javascripts/build_spec.js
index 549c7af8ea8..cba82c42d34 100644
--- a/spec/javascripts/build_spec.js
+++ b/spec/javascripts/build_spec.js
@@ -72,7 +72,9 @@ describe('Build', () => {
       it('displays the initial build trace', () => {
         expect($.ajax.calls.count()).toBe(1);
         const [{ url, dataType, success, context }] = $.ajax.calls.argsFor(0);
-        expect(url).toBe(`${BUILD_URL}.json`);
+        expect(url).toBe(
+          `${BUILD_URL}/trace.json`,
+        );
         expect(dataType).toBe('json');
         expect(success).toEqual(jasmine.any(Function));
 
diff --git a/spec/lib/gitlab/ci/trace/stream_spec.rb b/spec/lib/gitlab/ci/trace/stream_spec.rb
index 667e0ec21a4..f1a1a71c528 100644
--- a/spec/lib/gitlab/ci/trace/stream_spec.rb
+++ b/spec/lib/gitlab/ci/trace/stream_spec.rb
@@ -105,12 +105,6 @@ describe Gitlab::Ci::Trace::Stream do
         expect(result).to eq(lines.join)
         expect(result.encoding).to eq(Encoding.default_external)
       end
-
-      it 'raises an error if not passing an integer for last_lines' do
-        expect do
-          stream.raw(last_lines: lines)
-        end.to raise_error(ArgumentError)
-      end
     end
   end
 
diff --git a/spec/lib/gitlab/ci/trace_spec.rb b/spec/lib/gitlab/ci/trace_spec.rb
index d658ac9e1ec..69e8dc9220d 100644
--- a/spec/lib/gitlab/ci/trace_spec.rb
+++ b/spec/lib/gitlab/ci/trace_spec.rb
@@ -100,14 +100,9 @@ describe Gitlab::Ci::Trace do
       trace.set("1234")
     end
 
-    context 'append trace' do
-      before do
-      end
-
-      it "returns correct trace" do
-        expect(trace.append("56", 4)).to eq(6)
-        expect(trace.raw).to eq("123456")
-      end
+    it "returns correct trace" do
+      expect(trace.append("56", 4)).to eq(6)
+      expect(trace.raw).to eq("123456")
     end
 
     context 'tries to append trace at different offset' do
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 680ae2bcd5e..ec4ad667622 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -268,12 +268,7 @@ describe Ci::Build, :models do
   describe '#has_trace?' do
     subject { build.has_trace? }
 
-    it "expect to call exist? method" do
-      expect_any_instance_of(Gitlab::Ci::Trace).to receive(:exist?)
-        .and_return(true)
-
-      is_expected.to be(true)
-    end
+    it { is_expected.to delegate_method(:has_trace?).to(:trace).as(:exist?) }
   end
 
   describe '#trace=' do
@@ -295,10 +290,10 @@ describe Ci::Build, :models do
   end
 
   describe '#erase_old_trace!' do
-    subject { build.read_column(:trace) }
+    subject { build.send(:read_attribute, :trace) }
 
     before do
-      build.update_column(:trace, 'old trace')
+      build.send(:write_attribute, :trace, 'old trace')
     end
 
     it "expect to receive data from database" do
@@ -1077,61 +1072,6 @@ describe Ci::Build, :models do
     end
   end
 
-  describe '#trace' do
-    it 'obfuscates project runners token' do
-      allow(build).to receive(:raw_trace).and_return("Test: #{build.project.runners_token}")
-
-      expect(build.trace.raw).to eq("Test: xxxxxxxxxxxxxxxxxxxx")
-    end
-
-    it 'empty project runners token' do
-      allow(build).to receive(:raw_trace).and_return(test_trace)
-      # runners_token can't normally be set to nil
-      allow(build.project).to receive(:runners_token).and_return(nil)
-
-      expect(build.trace.raw).to eq(test_trace)
-    end
-
-    context 'when build does not have trace' do
-      it 'is is empty' do
-        expect(build.trace.raw).to be_nil
-      end
-    end
-
-    context 'when trace contains text' do
-      let(:text) { 'example output' }
-      before do
-        build.trace = text
-      end
-
-      it { expect(build.trace.raw).to eq(text) }
-    end
-
-    context 'when trace hides runners token' do
-      let(:token) { 'my_secret_token' }
-
-      before do
-        build.update(trace: token)
-        build.project.update(runners_token: token)
-      end
-
-      it { expect(build.trace.raw).not_to include(token) }
-      it { expect(build.raw_trace).to include(token) }
-    end
-
-    context 'when build.trace hides build token' do
-      let(:token) { 'my_secret_token' }
-
-      before do
-        build.update(trace: token)
-        build.update(token: token)
-      end
-
-      it { expect(build.trace.raw).not_to include(token) }
-      it { expect(build.raw_trace).to include(token) }
-    end
-  end
-
   describe '#has_expiring_artifacts?' do
     context 'when artifacts have expiration date set' do
       before { build.update(artifacts_expire_at: 1.day.from_now) }