Fix job setup in success empty state specs

3 files changed, 9 insertions, 7 deletions

diff --git a/lib/gitlab/ci/status/build/success.rb b/lib/gitlab/ci/status/build/success.rb
index bafc1b2f93a..daf43315c90 100644
--- a/lib/gitlab/ci/status/build/success.rb
+++ b/lib/gitlab/ci/status/build/success.rb
@@ -12,7 +12,7 @@ module Gitlab
           end
 
           def self.matches?(build, user)
-            build.success?
+            !build.has_trace? && build.success?
           end
         end
       end
diff --git a/spec/lib/gitlab/ci/status/build/factory_spec.rb b/spec/lib/gitlab/ci/status/build/factory_spec.rb
index 28166d08c02..d68d8f6f105 100644
--- a/spec/lib/gitlab/ci/status/build/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/factory_spec.rb
@@ -13,7 +13,7 @@ describe Gitlab::Ci::Status::Build::Factory do
   end
 
   context 'when build is successful' do
-    let(:build) { create(:ci_build, :success) }
+    let(:build) { create(:ci_build, :success, :trace_artifact) }
 
     it 'matches correct core status' do
       expect(factory.core_status).to be_a Gitlab::Ci::Status::Success
@@ -39,7 +39,7 @@ describe Gitlab::Ci::Status::Build::Factory do
 
     context 'when job log gets erased' do
       before do
-        build.trace.set(nil)
+        build.erase
       end
 
       it 'matches correct extended statuses' do
diff --git a/spec/lib/gitlab/ci/status/build/success_spec.rb b/spec/lib/gitlab/ci/status/build/success_spec.rb
index 730cd7aefbc..e67ab461463 100644
--- a/spec/lib/gitlab/ci/status/build/success_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/success_spec.rb
@@ -12,18 +12,20 @@ describe Gitlab::Ci::Status::Build::Success do
   end
 
   describe '.matches?' do
-    subject {described_class.matches?(build, user) }
+    subject { described_class.matches?(build, user) }
 
-    context 'when build succeeded' do
+    context 'when build succeeded but does not have trace' do
       let(:build) { create(:ci_build, :success) }
 
       it 'is a correct match' do
+        build.erase
+
         expect(subject).to be true
       end
     end
 
-    context 'when build did not succeed' do
-      let(:build) { create(:ci_build, :skipped) }
+    context 'when build succeed but has trace' do
+      let!(:build) { create(:ci_build, :success, :trace_artifact) }
 
       it 'does not match' do
         expect(subject).to be false