Hashar has submitted this change and it was merged.
Change subject: Fixed RuboCop Style/AndOr offense
......................................................................
Fixed RuboCop Style/AndOr offense
Used auto correct:
$ bundle exec rubocop --auto-correct
Bug: 72841
Change-Id: I9746cf39f81cbaa8125407cee91758724474d60f
---
M .rubocop_todo.yml
M bin/doccomparer.rb
2 files changed, 1 insertion(+), 7 deletions(-)
Approvals:
Hashar: Verified; Looks good to me, approved
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 5fb54e1..f2ed405 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -33,12 +33,6 @@
Max: 48
# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/AndOr:
- Enabled: false
-
-# Offense count: 1
Style/AsciiComments:
Enabled: false
diff --git a/bin/doccomparer.rb b/bin/doccomparer.rb
index 4bb52cc..e5bfb94 100644
--- a/bin/doccomparer.rb
+++ b/bin/doccomparer.rb
@@ -107,7 +107,7 @@
a_val, b_val = {}, {}
end
- if a_val.is_a? Hash and b_val.is_a? Hash
+ if a_val.is_a?(Hash) && b_val.is_a?(Hash)
comparison_result = indent method(nested).call(a_val,
b_val, a_name, b_name), 2
if comparison_result.strip == ''
"#{key}: match" if $VERBOSE
--
To view, visit https://gerrit.wikimedia.org/r/172722
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9746cf39f81cbaa8125407cee91758724474d60f
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
