Improve Specs and some fixes

2 files changed, 9 insertions, 7 deletions

diff --git a/lib/system_check/base_check.rb b/lib/system_check/base_check.rb
index aff830f54d7..63b7eea5add 100644
--- a/lib/system_check/base_check.rb
+++ b/lib/system_check/base_check.rb
@@ -1,9 +1,11 @@
+require 'tasks/gitlab/task_helpers'
+
 module SystemCheck
   # Base class for Checks. You must inherit from here
   # and implement the methods below when necessary
   class BaseCheck
     include ::Gitlab::TaskHelpers
-    include Helpers
+    include ::SystemCheck::Helpers
 
     # Define a custom term for when check passed
     #
diff --git a/lib/system_check/simple_executor.rb b/lib/system_check/simple_executor.rb
index 7a5042047ab..ad2f549b3fb 100644
--- a/lib/system_check/simple_executor.rb
+++ b/lib/system_check/simple_executor.rb
@@ -24,17 +24,17 @@ module SystemCheck
 
       c = check.new
 
-      # When implements a multi check, we don't control the output
-      if c.is_multi_check?
-        c.multi_check
-        return
-      end
-
       # When implements skip method, we run it first, and if true, skip the check
       if c.can_skip? && c.skip?
         $stdout.puts check.skip_reason.color(:magenta)
         return
       end
+      
+      # When implements a multi check, we don't control the output
+      if c.is_multi_check?
+        c.multi_check
+        return
+      end
 
       if c.check?
         $stdout.puts check.check_pass.color(:green)