Stan has uploaded a new change for review.
https://gerrit.wikimedia.org/r/176255
Change subject: rubocop line length fixes
......................................................................
rubocop line length fixes
Bug: T75898
Change-Id: I1735802960570636aecee9e0c89cb8487990f528
---
M .rubocop.yml
M .rubocop_todo.yml
M lib/mediawiki_selenium/support/env.rb
M lib/mediawiki_selenium/support/hooks.rb
M lib/mediawiki_selenium/support/sauce.rb
M mediawiki_selenium.gemspec
6 files changed, 38 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium
refs/changes/55/176255/1
diff --git a/.rubocop.yml b/.rubocop.yml
index cc32da4..345b03d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1 +1,5 @@
inherit_from: .rubocop_todo.yml
+
+Metrics/LineLength:
+ Max: 100
+
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ee3ef98..e2a84f3 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -9,11 +9,6 @@
Metrics/CyclomaticComplexity:
Max: 16
-# Offense count: 36
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
- Max: 187
-
# Offense count: 2
# Configuration parameters: CountComments.
Metrics/MethodLength:
diff --git a/lib/mediawiki_selenium/support/env.rb
b/lib/mediawiki_selenium/support/env.rb
index 429331a..9f8baa4 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -40,7 +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'] and ENV['SAUCE_ONDEMAND_ACCESS_KEY'] and
+ ENV['BROWSER'] != 'phantomjs' and ENV['HEADLESS'] != 'true'
:saucelabs
else
:local
@@ -90,8 +91,11 @@
:payload => json
)
end
+WebDriver_Capabilties = Selenium::WebDriver::Remote::Capabilities
def sauce_browser(test_name, configuration)
- abort 'Environment variables BROWSER, PLATFORM and VERSION have to be set'
if (ENV['BROWSER'] == nil) or (ENV['PLATFORM'] == nil) or (ENV['VERSION'] ==
nil)
+ if (ENV['BROWSER'] == nil) or (ENV['PLATFORM'] == nil) or (ENV['VERSION'] ==
nil)
+ abort 'Environment variables BROWSER, PLATFORM and VERSION have to be set'
+ end
client = Selenium::WebDriver::Remote::Http::Default.new
@@ -102,21 +106,21 @@
profile = Selenium::WebDriver::Firefox::Profile.new
profile['dom.max_script_run_time'] = timeout
profile['dom.max_chrome_script_run_time'] = timeout
- caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile
=> profile)
+ caps = WebDriver_Capabilities.firefox(:firefox_profile => profile)
elsif configuration && configuration[:language] && ENV['BROWSER'] ==
'firefox'
profile = Selenium::WebDriver::Firefox::Profile.new
profile['intl.accept_languages'] = configuration[:language]
- caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile
=> profile)
+ caps = WebDriver_Capabilities.firefox(:firefox_profile => profile)
elsif configuration && configuration[:language] && ENV['BROWSER'] == 'chrome'
profile = Selenium::WebDriver::Chrome::Profile.new
profile['intl.accept_languages'] = configuration[:language]
- caps = Selenium::WebDriver::Remote::Capabilities.chrome('chrome.profile'
=> profile.as_json['zip'])
+ caps = WebDriver_Capabilities.chrome('chrome.profile' =>
profile.as_json['zip'])
elsif configuration && configuration[:user_agent] && ENV['BROWSER'] ==
'firefox'
profile = Selenium::WebDriver::Firefox::Profile.new
profile['general.useragent.override'] = configuration[:user_agent]
- caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile
=> profile)
+ caps = WebDriver_Capabilities.firefox(:firefox_profile => profile)
else
- caps = Selenium::WebDriver::Remote::Capabilities.send(ENV['BROWSER'])
+ caps = WebDriver_Capabilities.send(ENV['BROWSER'])
end
caps.platform = ENV['PLATFORM']
@@ -126,7 +130,8 @@
browser = Watir::Browser.new(
:remote,
http_client: client,
- url:
"http://#{ENV['SAUCE_ONDEMAND_USERNAME']}:#{ENV['SAUCE_ONDEMAND_ACCESS_KEY']}@ondemand.saucelabs.com:80/wd/hub",
+ url:
"http://#{ENV['SAUCE_ONDEMAND_USERNAME']}:#{ENV['SAUCE_ONDEMAND_ACCESS_KEY']}@"
\
+ 'ondemand.saucelabs.com:80/wd/hub',
desired_capabilities: caps)
browser.wd.file_detector = lambda do |args|
# args => ["/path/to/file"]
@@ -143,6 +148,7 @@
if scenario.respond_to? :feature
"#{scenario.feature.title}: #{scenario.title}"
elsif scenario.respond_to? :scenario_outline
- "#{scenario.scenario_outline.feature.title}:
#{scenario.scenario_outline.title}: #{scenario.name}"
+ "#{scenario.scenario_outline.feature.title}:
#{scenario.scenario_outline.title}: " \
+ "#{scenario.name}"
end
end
diff --git a/lib/mediawiki_selenium/support/hooks.rb
b/lib/mediawiki_selenium/support/hooks.rb
index 9b6b9c2..3e63a15 100644
--- a/lib/mediawiki_selenium/support/hooks.rb
+++ b/lib/mediawiki_selenium/support/hooks.rb
@@ -14,9 +14,13 @@
end
Before('@login') do
- ENV['MEDIAWIKI_PASSWORD'] = ENV[ENV['MEDIAWIKI_PASSWORD_VARIABLE']] if
ENV['MEDIAWIKI_PASSWORD_VARIABLE']
- puts 'MEDIAWIKI_USER environment variable is not defined! Please export a
value for that variable before proceeding.' unless ENV['MEDIAWIKI_USER']
- puts 'MEDIAWIKI_PASSWORD environment variable is not defined! Please export
a value for that variable before proceeding.' unless ENV['MEDIAWIKI_PASSWORD']
+ if ENV['MEDIAWIKI_PASSWORD_VARIABLE']
+ ENV['MEDIAWIKI_PASSWORD'] = ENV[ENV['MEDIAWIKI_PASSWORD_VARIABLE']]
+ end
+ puts 'MEDIAWIKI_USER environment variable is not defined! Please export a
value for that ' \
+ 'variable before proceeding.' unless ENV['MEDIAWIKI_USER']
+ puts 'MEDIAWIKI_PASSWORD environment variable is not defined! Please export
a value for that ' \
+ 'variable before proceeding.' unless ENV['MEDIAWIKI_PASSWORD']
end
AfterConfiguration do |config|
diff --git a/lib/mediawiki_selenium/support/sauce.rb
b/lib/mediawiki_selenium/support/sauce.rb
index a484ba8..9e15f2e 100644
--- a/lib/mediawiki_selenium/support/sauce.rb
+++ b/lib/mediawiki_selenium/support/sauce.rb
@@ -24,7 +24,8 @@
else
sauce_job_page = 'Uh-oh. Could not find link to Sauce Labs job URL.'
end
- ([sauce_job_page] + ["#{exception.message} (#{exception.class})"] +
exception.backtrace).join("\n")
+ ([sauce_job_page] + ["#{exception.message} (#{exception.class})"] +
+ exception.backtrace).join("\n")
end
end
end
diff --git a/mediawiki_selenium.gemspec b/mediawiki_selenium.gemspec
index d81c31e..3455df2 100644
--- a/mediawiki_selenium.gemspec
+++ b/mediawiki_selenium.gemspec
@@ -6,11 +6,16 @@
Gem::Specification.new do |spec|
spec.name = 'mediawiki_selenium'
spec.version = MediawikiSelenium::VERSION
- spec.authors = ['Chris McMahon', 'Dan Duvall', 'Jeff Hall', 'Nikolas
Everett', 'Tobias Gritschacher', 'Željko Filipin']
- spec.email = ['cmcma...@wikimedia.org', 'dduv...@wikimedia.org',
'jh...@wikimedia.org', 'never...@wikimedia.org',
'tobias.gritschac...@wikimedia.de', 'zeljko.fili...@gmail.com']
- spec.description = %q{Several MediaWiki extensions share code that makes
it easy to run Selenium tests. This gem
-makes it easy to update the shared code.}
- spec.summary = %q{An easy way to run MediaWiki Selenium tests.}
+ spec.authors = ['Chris McMahon', 'Dan Duvall', 'Jeff Hall', 'Nikolas
Everett',
+ 'Tobias Gritschacher', 'Željko Filipin']
+ spec.email = ['cmcma...@wikimedia.org', 'dduv...@wikimedia.org',
'jh...@wikimedia.org',
+ 'never...@wikimedia.org',
'tobias.gritschac...@wikimedia.de',
+ 'zeljko.fili...@gmail.com']
+ spec.description = <<-EOF
+Several MediaWiki extensions share code that makes it easy to run Selenium
+tests. This gem makes it easy to update the shared code.
+EOF
+ spec.summary = 'An easy way to run MediaWiki Selenium tests.'
spec.homepage =
'https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/selenium'
spec.license = 'GPL-2'
--
To view, visit https://gerrit.wikimedia.org/r/176255
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1735802960570636aecee9e0c89cb8487990f528
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
