Merge pull request #1338 from Earlopain/enable-undefined-config

Enable `InternalAffairs/UndefinedConfig`

Author: koic

.rubocop.yml

@@ -19,10 +19,6 @@ AllCops:
 InternalAffairs/NodeMatcherDirective:
   Enabled: false
 
-# FIXME: Workaround for a false positive caused by this cop when using `bundle exec rake`.
-InternalAffairs/UndefinedConfig:
-  Enabled: false
-
 Naming/InclusiveLanguage:
   Enabled: true
   CheckStrings: true

lib/rubocop/cop/rails/present.rb

@@ -98,8 +98,6 @@ def on_and(node)
         end
 
         def on_or(node)
-          return unless cop_config['NilOrEmpty']
-
           exists_and_not_empty?(node) do |var1, var2|
             return unless var1 == var2
 

lib/rubocop/cop/rails/skips_model_validations.rb

@@ -100,7 +100,8 @@ def allowed_method?(node)
         end
 
         def forbidden_methods
-          obsolete_result = cop_config['Blacklist']
+          # TODO: Remove when RuboCop Rails 3 releases.
+          obsolete_result = cop_config['Blacklist'] # rubocop:disable InternalAffairs/UndefinedConfig
           if obsolete_result
             warn '`Blacklist` has been renamed to `ForbiddenMethods`.' unless @displayed_forbidden_warning
             @displayed_forbidden_warning = true
@@ -111,7 +112,8 @@ def forbidden_methods
         end
 
         def allowed_methods
-          obsolete_result = cop_config['Whitelist']
+          # TODO: Remove when RuboCop Rails 3 releases.
+          obsolete_result = cop_config['Whitelist'] # rubocop:disable InternalAffairs/UndefinedConfig
           if obsolete_result
             warn '`Whitelist` has been renamed to `AllowedMethods`.' unless @displayed_allowed_warning
             @displayed_allowed_warning = true