Stan has uploaded a new change for review.
https://gerrit.wikimedia.org/r/176258
Change subject: rubocop and/or style fixes
......................................................................
rubocop and/or style fixes
Bug: T75898
Change-Id: I22048e027c3ceef4b227acb9fa1d9ad2345c7e82
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/support/env.rb
2 files changed, 3 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium
refs/changes/58/176258/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6f12914..425b1a8 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,12 +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: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/AndOr:
- Enabled: false
-
# Offense count: 3
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
diff --git a/lib/mediawiki_selenium/support/env.rb
b/lib/mediawiki_selenium/support/env.rb
index 56f7ddc..d2728ce 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -40,8 +40,8 @@
end
end
def environment
- if ENV['SAUCE_ONDEMAND_USERNAME'] and ENV['SAUCE_ONDEMAND_ACCESS_KEY'] and
- ENV['BROWSER'] != 'phantomjs' and ENV['HEADLESS'] != 'true'
+ if ENV['SAUCE_ONDEMAND_USERNAME'] && ENV['SAUCE_ONDEMAND_ACCESS_KEY'] &&
+ ENV['BROWSER'] != 'phantomjs' && ENV['HEADLESS'] != 'true'
:saucelabs
else
:local
@@ -93,7 +93,7 @@
end
WebDriver_Capabilties = Selenium::WebDriver::Remote::Capabilities
def sauce_browser(test_name, configuration)
- if (ENV['BROWSER'] == nil) or (ENV['PLATFORM'] == nil) or (ENV['VERSION'] ==
nil)
+ if (ENV['BROWSER'] == nil) || (ENV['PLATFORM'] == nil) || (ENV['VERSION'] ==
nil)
abort 'Environment variables BROWSER, PLATFORM and VERSION have to be set'
end
--
To view, visit https://gerrit.wikimedia.org/r/176258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I22048e027c3ceef4b227acb9fa1d9ad2345c7e82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan <tris...@saticed.me.uk>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
