Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/109901
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(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium refs/changes/01/109901/1 diff --git a/lib/mediawiki/selenium/env.rb b/lib/mediawiki/selenium/env.rb index 03de49a..f0774b6 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: newchange Gerrit-Change-Id: Ia7075616a72b0b7cfc3e4d943b082dff51ca7f4e 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