1 files changed, 10 insertions, 15 deletions
diff --git a/lib/gitlab/ci/status/factory.rb b/lib/gitlab/ci/status/factory.rb
index 71c54aebcc3..3da5ae4fc01 100644
--- a/lib/gitlab/ci/status/factory.rb
+++ b/lib/gitlab/ci/status/factory.rb
@@ -5,6 +5,7 @@ module Gitlab
         def initialize(subject, user)
           @subject = subject
           @user = user
+          @status = subject.status || :created
         end
 
         def fabricate!
@@ -17,23 +18,9 @@ module Gitlab
           end
         end
 
-        def self.extended_statuses
-          []
-        end
-
-        def self.common_helpers
-          Module.new
-        end
-
-        private
-
-        def simple_status
-          @simple_status ||= @subject.status || :created
-        end
-
         def core_status
           Gitlab::Ci::Status
-            .const_get(simple_status.capitalize)
+            .const_get(@status.capitalize)
             .new(@subject, @user)
             .extend(self.class.common_helpers)
         end
@@ -47,6 +34,14 @@ module Gitlab
 
           @extended_statuses = groups.flatten.compact
         end
+
+        def self.extended_statuses
+          []
+        end
+
+        def self.common_helpers
+          Module.new
+        end
       end
     end
   end