Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 0 deletions

diff --git a/spec/factories/ci/bridge.rb b/spec/factories/ci/bridge.rb
index 7727a468633..7258b3367d3 100644
--- a/spec/factories/ci/bridge.rb
+++ b/spec/factories/ci/bridge.rb
@@ -53,6 +53,11 @@ FactoryBot.define do
       finished_at { '2013-10-29 09:53:28 CET' }
     end
 
+    trait :success do
+      finished
+      status { 'success' }
+    end
+
     trait :failed do
       finished
       status { 'failed' }
@@ -75,5 +80,9 @@ FactoryBot.define do
     trait :playable do
       manual
     end
+
+    trait :allowed_to_fail do
+      allow_failure { true }
+    end
   end
 end