Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113354
Change subject: WIP Removed configuration of Sauce Labs browsers from the gem
......................................................................
WIP Removed configuration of Sauce Labs browsers from the gem
Also bumped patch version to 0.2.4 and releasing the new version of the
gem.
Bug: 61067
Change-Id: Id12c6dfc748abeef99120bcf2e7c8e679cd9a34c
---
M lib/mediawiki_selenium/support/env.rb
M lib/mediawiki_selenium/version.rb
2 files changed, 7 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium
refs/changes/54/113354/1
diff --git a/lib/mediawiki_selenium/support/env.rb
b/lib/mediawiki_selenium/support/env.rb
index 2bd50d8..a020026 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -75,59 +75,22 @@
)
end
def sauce_browser(test_name, language)
- browsers = {
-
- "chrome" =>
- {"name" => "chrome",
- "platform" => "Linux",
- "version" => nil},
-
- "firefox" =>
- {"name" => "firefox",
- "platform" => "Linux",
- "version" => 26},
-
- "internet_explorer_6" =>
- {"name" => "internet_explorer",
- "platform" => "Windows XP",
- "version"=> 6},
-
- "internet_explorer_7" =>
- {"name" => "internet_explorer",
- "platform" => "Windows XP",
- "version"=> 7},
-
- "internet_explorer_8" =>
- {"name" => "internet_explorer",
- "platform" => "Windows XP",
- "version"=> 8},
-
- "internet_explorer_9" =>
- {"name" => "internet_explorer",
- "platform" => "Windows 7",
- "version"=> 9},
-
- "internet_explorer_10" =>
- {"name" => "internet_explorer",
- "platform" => "Windows 8",
- "version"=> 10}}
-
- browser_label = browsers[ENV["BROWSER_LABEL"]]
+ abort "Environment variables BROWSER, PLATFORM and VERSION have to be set"
if (ENV["BROWSER"] == nil) or (ENV["PLATFORM"] == nil) or (ENV["VERSION"] ==
nil)
if language == "default"
- caps =
Selenium::WebDriver::Remote::Capabilities.send(browser_label["name"])
- elsif browser_label["name"] == "firefox"
+ caps = Selenium::WebDriver::Remote::Capabilities.send(ENV["BROWSER"])
+ elsif ENV["BROWSER"] == "firefox"
profile = Selenium::WebDriver::Firefox::Profile.new
profile["intl.accept_languages"] = language
caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile
=> profile)
- elsif browser_label["name"] == "chrome"
+ elsif ENV["BROWSER"] == "chrome"
profile = Selenium::WebDriver::Chrome::Profile.new
profile["intl.accept_languages"] = language
caps = Selenium::WebDriver::Remote::Capabilities.chrome("chrome.profile"
=> profile.as_json["zip"])
end
- caps.platform = browser_label["platform"]
- caps.version = browser_label["version"]
+ caps.platform = ENV["PLATFORM"]
+ caps.version = ENV["VERSION"]
caps[:name] = "#{test_name} #{ENV['JOB_NAME']}##{ENV['BUILD_NUMBER']}"
require "selenium/webdriver/remote/http/persistent" # http_client
diff --git a/lib/mediawiki_selenium/version.rb
b/lib/mediawiki_selenium/version.rb
index 379453c..f0e7bab 100644
--- a/lib/mediawiki_selenium/version.rb
+++ b/lib/mediawiki_selenium/version.rb
@@ -10,5 +10,5 @@
=end
module MediawikiSelenium
- VERSION = "0.2.3"
+ VERSION = "0.2.4"
end
--
To view, visit https://gerrit.wikimedia.org/r/113354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id12c6dfc748abeef99120bcf2e7c8e679cd9a34c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <zfili...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
