jenkins-bot has submitted this change and it was merged.
Change subject: QA: update for rubocop offenses
......................................................................
QA: update for rubocop offenses
No change to function, just cleaning up
Change-Id: I1b0b4fe8e4f785cbeebc2d1415a45f831dc75f5c
---
M .rubocop.yml
M .rubocop_todo.yml
M tests/browser/features/step_definitions/messages_steps.rb
M tests/browser/features/step_definitions/notifications_steps.rb
4 files changed, 39 insertions(+), 13 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.rubocop.yml b/.rubocop.yml
index cc32da4..6ca0170 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1 +1,28 @@
inherit_from: .rubocop_todo.yml
+
+Metrics/AbcSize:
+ Enabled: false
+
+Metrics/ClassLength:
+ Enabled: false
+
+Metrics/CyclomaticComplexity:
+ Enabled: false
+
+Metrics/LineLength:
+ Max: 100
+
+Metrics/MethodLength:
+ Enabled: false
+
+Metrics/ParameterLists:
+ Enabled: false
+
+Metrics/PerceivedComplexity:
+ Enabled: false
+
+Style/Alias:
+ Enabled: false
+
+Style/SignalException:
+ Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 64c4ced..2dc0f05 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,14 +1,9 @@
# This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-11-07 14:36:31 -0700 using RuboCop version 0.27.0.
+# on 2015-02-20 09:41:11 -0700 using RuboCop version 0.29.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 11
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
- Max: 128
# Offense count: 3
Style/AccessorMethodName:
@@ -22,4 +17,3 @@
# Configuration parameters: AllowedVariables.
Style/GlobalVars:
Enabled: false
-
diff --git a/tests/browser/features/step_definitions/messages_steps.rb
b/tests/browser/features/step_definitions/messages_steps.rb
index 0c85baf..1f277f5 100644
--- a/tests/browser/features/step_definitions/messages_steps.rb
+++ b/tests/browser/features/step_definitions/messages_steps.rb
@@ -7,8 +7,9 @@
username = get_session_username_b
step 'the user "' + username + '" exists'
client.log_in(username, ENV['MEDIAWIKI_PASSWORD'])
- client.action('flow', token_type: 'edit', submodule: 'new-topic', page:
'Talk:Flow QA',
- nttopic: 'Mention #1', ntcontent: '[[User:' +
get_session_username + ']] I wanted to say hello.')
+ client.action(
+ 'flow', token_type: 'edit', submodule: 'new-topic', page: 'Talk:Flow QA',
nttopic: 'Mention #1',
+ ntcontent: '[[User:' + get_session_username + ']] I wanted to say
hello.')
end
When(/^I click the mark all as read button$/) do
diff --git a/tests/browser/features/step_definitions/notifications_steps.rb
b/tests/browser/features/step_definitions/notifications_steps.rb
index d61f95b..c202837 100644
--- a/tests/browser/features/step_definitions/notifications_steps.rb
+++ b/tests/browser/features/step_definitions/notifications_steps.rb
@@ -36,8 +36,10 @@
end
Given(/^another user writes on my talk page$/) do
- make_page_with_user_b('User talk:' + get_session_username,
- "== Barnstar ==\nHello Selenium, here is a barnstar
for all your testing! " + @random_string + "~~~~\n")
+ make_page_with_user_b(
+ 'User talk:' + get_session_username,
+ "== Barnstar ==\nHello Selenium, here is a barnstar for all your testing!
" +
+ @random_string + "~~~~\n")
end
Given(/^another user @s me on "(.*?)"$/) do |title|
@@ -81,9 +83,11 @@
end
Then(/^I have no new notifications$/) do
- expect(on(ArticlePage).flyout_link_element.when_present.class_name).not_to
match 'mw-echo-unread-notifications'
+ expect(on(ArticlePage).flyout_link_element.when_present.class_name).not_to
+ match 'mw-echo-unread-notifications'
end
Then(/^I have new notifications$/) do
- expect(on(ArticlePage).flyout_link_element.when_present.class_name).to match
'mw-echo-unread-notifications'
+ expect(on(ArticlePage).flyout_link_element.when_present.class_name).to
+ match 'mw-echo-unread-notifications'
end
--
To view, visit https://gerrit.wikimedia.org/r/191901
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b0b4fe8e4f785cbeebc2d1415a45f831dc75f5c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
