Cmcmahon has submitted this change and it was merged.
Change subject: QA: make rubocop linter happy
......................................................................
QA: make rubocop linter happy
Change-Id: I1a4b1aa14c811e1ca9bea917eff81ee91873c11e
---
M .rubocop_todo.yml
M tests/browser/features/step_definitions/action_menu_permalink_steps.rb
M tests/browser/features/step_definitions/reply_moderation_steps.rb
M tests/browser/features/support/pages/flow_page.rb
M tests/browser/features/support/pages/new_flow_page.rb
5 files changed, 2 insertions(+), 25 deletions(-)
Approvals:
Cmcmahon: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d625ba7..7240b16 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,24 +5,6 @@
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
-# Offense count: 1
-Lint/ParenthesesAsGroupedExpression:
- Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Lint/UnusedBlockArgument:
- Enabled: false
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
- Max: 170
-
-# Offense count: 66
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
- Max: 224
# Offense count: 1
# Cop supports --auto-correct.
diff --git
a/tests/browser/features/step_definitions/action_menu_permalink_steps.rb
b/tests/browser/features/step_definitions/action_menu_permalink_steps.rb
index b783d7b..9cfe513 100644
--- a/tests/browser/features/step_definitions/action_menu_permalink_steps.rb
+++ b/tests/browser/features/step_definitions/action_menu_permalink_steps.rb
@@ -1,9 +1,7 @@
When(/^I add (\d+) comments to the Topic$/) do |number|
number.to_i.times do
- on(FlowPage) do |page|
@saved_random=Random.new.rand.to_s
step 'I reply with comment "' + 'Selenium comment ' + @saved_random + '"'
- end
end
end
diff --git a/tests/browser/features/step_definitions/reply_moderation_steps.rb
b/tests/browser/features/step_definitions/reply_moderation_steps.rb
index b45ea0f..aa7ebe8 100644
--- a/tests/browser/features/step_definitions/reply_moderation_steps.rb
+++ b/tests/browser/features/step_definitions/reply_moderation_steps.rb
@@ -16,6 +16,6 @@
end
end
-Then (/^the content of the 3rd comment should not be visible$/) do
+Then(/^the content of the 3rd comment should not be visible$/) do
expect(on(FlowPage).third_reply_content_element).not_to be_visible
end
diff --git a/tests/browser/features/support/pages/flow_page.rb
b/tests/browser/features/support/pages/flow_page.rb
index 2388be1..4854840 100644
--- a/tests/browser/features/support/pages/flow_page.rb
+++ b/tests/browser/features/support/pages/flow_page.rb
@@ -2,7 +2,6 @@
include PageObject
a(:logout, css: "#pt-logout a")
end
-
class FlowPage < WikiPage
include URL
# MEDIAWIKI_URL must have this in $wgFlowOccupyPages array or
$wgFlowOccupyNamespaces.
@@ -238,5 +237,4 @@
a(:board_unwatch_link, href: /Flow_QA&action=unwatch/)
a(:board_watch_link, href: /Flow_QA&action=watch/)
-
- end
+end
\ No newline at end of file
diff --git a/tests/browser/features/support/pages/new_flow_page.rb
b/tests/browser/features/support/pages/new_flow_page.rb
index 1483a74..19a4695 100644
--- a/tests/browser/features/support/pages/new_flow_page.rb
+++ b/tests/browser/features/support/pages/new_flow_page.rb
@@ -1,7 +1,6 @@
require "page-object"
class NewFlowPage < FlowPage
-
include URL
# MEDIAWIKI_URL must have User_talk in $wgFlowOccupyNamespaces.
page_url URL.url("User_talk:New page " + Array.new(8){[*'0'..'9', *'a'..'z',
*'A'..'Z'].sample}.join )
--
To view, visit https://gerrit.wikimedia.org/r/171720
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a4b1aa14c811e1ca9bea917eff81ee91873c11e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: SG <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
