Fix Style/NegatedIf

lynndylanhurley · Mar 25, 2018 · c3df98a · c3df98a
1 parent a0e8b64
commit c3df98a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -641,14 +641,6 @@ Style/MutableConstant:
     - 'test/dummy/app/controllers/overrides/token_validations_controller.rb'
     - 'test/dummy/app/helpers/application_helper.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: both, prefix, postfix
-Style/NegatedIf:
-  Exclude:
-    - 'app/controllers/devise_token_auth/concerns/set_user_by_token.rb'
-    - 'app/controllers/devise_token_auth/omniauth_callbacks_controller.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.

diff --git a/app/controllers/devise_token_auth/concerns/set_user_by_token.rb b/app/controllers/devise_token_auth/concerns/set_user_by_token.rb
@@ -70,7 +70,7 @@ def set_user_by_token(mapping=nil)
     return @resource if @resource && @resource.is_a?(rc)
 
     # ensure we clear the client_id
-    if !@token
+    unless @token
       @client_id = nil
       return
     end

diff --git a/app/controllers/devise_token_auth/omniauth_callbacks_controller.rb b/app/controllers/devise_token_auth/omniauth_callbacks_controller.rb
@@ -60,7 +60,7 @@ def omniauth_failure
     # after use.  In the failure case, finally, the omniauth params
     # are added as query params in our monkey patch to OmniAuth in engine.rb
     def omniauth_params
-      if !defined?(@_omniauth_params)
+      unless defined?(@_omniauth_params)
         if request.env['omniauth.params'] && request.env['omniauth.params'].any?
           @_omniauth_params = request.env['omniauth.params']
         elsif session['dta.omniauth.params'] && session['dta.omniauth.params'].any?