rubocop: enable Style/NonNilCheck

.rubocop.yml

@@ -152,12 +152,3 @@ Style/NilComparison:
   Exclude:
     - 'src/clients/security.rb'
     - 'src/include/security/routines.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: IncludeSemanticChanges.
-Style/NonNilCheck:
-  Exclude:
-    - 'src/include/security/dialogs.rb'
-    - 'src/include/security/routines.rb'
-    - 'src/modules/Security.rb'

src/include/security/dialogs.rb

@@ -337,7 +337,7 @@ def DisplayHelpPopup(help_id)
       when "MANDATORY_SERVICES"
         missing = Security.MissingMandatoryServices
 
-        if missing != nil && missing != []
+        if !missing.nil? && missing != []
           srvs = ""
 
           Builtins.foreach(missing) do |l|
@@ -356,7 +356,7 @@ def DisplayHelpPopup(help_id)
       when "EXTRA_SERVICES"
         extra = Security.ExtraServices
 
-        if extra != nil && extra != []
+        if !extra.nil? && extra != []
           srvs = Builtins.mergestring(extra, "<BR>")
           help +=
             _("<P>These extra services are enabled:<BR><B>%s</B></P>") % srvs
@@ -366,7 +366,7 @@ def DisplayHelpPopup(help_id)
         end
       end
 
-      if help != nil && help != ""
+      if !help.nil? && help != ""
         Popup.LongText(
           Ops.get(@label_mapping, help_id, _("Description")),
           RichText(help),

src/include/security/routines.rb

@@ -165,7 +165,7 @@ def widget2settings(id)
         new = nil
       end
 
-      if new != nil && Ops.get(Security.Settings, id, "") != new
+      if !new.nil? && Ops.get(Security.Settings, id, "") != new
         Builtins.y2milestone(
           "Setting modified (%1): %2 -> %3)",
           id,

src/modules/Security.rb

@@ -288,7 +288,7 @@ def PollAbort
     # Abort function
     # @return blah blah lahjk
     def Abort
-      return Builtins.eval(@AbortFunction) == true if @AbortFunction != nil
+      return Builtins.eval(@AbortFunction) == true if !@AbortFunction.nil?
 
       false
     end