Fix Lint/UnderscorePrefixedVariableName issue and remove it from rubocop_todo file

This commit is contained in:
Bertocq
2017-06-16 00:28:50 +02:00
parent db97314f7b
commit c88d822330
2 changed files with 5 additions and 2 deletions

View File

@@ -14,6 +14,7 @@ Lint/InheritException:
Exclude: Exclude:
- 'app/controllers/concerns/feature_flags.rb' - 'app/controllers/concerns/feature_flags.rb'
<<<<<<< HEAD
# Offense count: 13 # Offense count: 13
Lint/ParenthesesAsGroupedExpression: Lint/ParenthesesAsGroupedExpression:
Exclude: Exclude:
@@ -27,6 +28,8 @@ Lint/UnderscorePrefixedVariableName:
Exclude: Exclude:
- 'lib/manager_authenticator.rb' - 'lib/manager_authenticator.rb'
=======
>>>>>>> 0da0d145c... Fix Lint/UnderscorePrefixedVariableName issue and remove it from rubocop_todo file
# Offense count: 4 # Offense count: 4
# Cop supports --auto-correct. # Cop supports --auto-correct.
# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments. # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.

View File

@@ -5,7 +5,7 @@ class ManagerAuthenticator
end end
def auth def auth
return false unless [@manager[:login], @manager[:user_key], @manager[:date]].all? {|_| _.present?} return false unless [@manager[:login], @manager[:user_key], @manager[:date]].all? {|manager| manager.present?}
return @manager if manager_exists? && application_authorized? return @manager if manager_exists? && application_authorized?
false false
end end
@@ -41,4 +41,4 @@ class ManagerAuthenticator
def application_key def application_key
Rails.application.secrets.managers_application_key.to_s Rails.application.secrets.managers_application_key.to_s
end end
end end