jenkins-bot has submitted this change and it was merged.
Change subject: Moved Sauce Labs browser configuration to the gem
......................................................................
Moved Sauce Labs browser configuration to the gem
It used to be duplicated in every repository.
Bug: 56085
Change-Id: Ia7075616a72b0b7cfc3e4d943b082dff51ca7f4e
---
M lib/mediawiki/selenium/env.rb
M lib/mediawiki/selenium/hooks.rb
2 files changed, 38 insertions(+), 5 deletions(-)
Approvals:
Jhall: Looks good to me, but someone else must approve
Nikerabbit: Looks good to me, but someone else must approve
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki/selenium/env.rb b/lib/mediawiki/selenium/env.rb
index 03de49a..41c3354 100644
--- a/lib/mediawiki/selenium/env.rb
+++ b/lib/mediawiki/selenium/env.rb
@@ -75,8 +75,44 @@
)
end
def sauce_browser(test_name, language)
- config = YAML.load_file("config/config.yml")
- browser_label = config[ENV["BROWSER_LABEL"]]
+ 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"]]
if language == "default"
caps =
Selenium::WebDriver::Remote::Capabilities.send(browser_label["name"])
diff --git a/lib/mediawiki/selenium/hooks.rb b/lib/mediawiki/selenium/hooks.rb
index a1d4bea..c05e938 100644
--- a/lib/mediawiki/selenium/hooks.rb
+++ b/lib/mediawiki/selenium/hooks.rb
@@ -9,8 +9,6 @@
https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
=end
-config = YAML.load_file("config/config.yml")
-
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"]
@@ -18,7 +16,6 @@
end
Before do |scenario|
- @config = config
@random_string = Random.new.rand.to_s
if ENV["REUSE_BROWSER"] == "true" and $browser # CirrusSearch and
VisualEditor need this
@browser = $browser
--
To view, visit https://gerrit.wikimedia.org/r/109901
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7075616a72b0b7cfc3e4d943b082dff51ca7f4e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: Jhall <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
