mediawiki_selenium 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99b7b4ccc4f6df7bc91ad09c998b40fd82474713
-  data.tar.gz: 9ce4df71916e28f2fad9b6820b2a17fa658b5af1
+  metadata.gz: 803af6a3b0e01b71f76fdc2f8b5a386a68275c76
+  data.tar.gz: 7fa1c41c012a31f926cb147f213b6b2b3de2b7de
 SHA512:
-  metadata.gz: 94e23716e38d82fb75f48963f7829cb6576587f0d233b031f24b911d3c7afe4b862969d5317210898c44ef0368c2dcafdee0b65cc2bacbae0a76acbe3410c646
-  data.tar.gz: 0463a7435c9bca068acd42d61f65e4f7ee180790a0956fa25c070d9c1791568b5055c4fbb4692c2deb0bb187dd86925831d78063d42eeeee17bc2d320f150b1d
+  metadata.gz: aee7c180a02d04d8407b442682ead80a33fa9079228578cbce893799aecbb51c112b64be81f188c4557e35aac4d9f310119fa608e133f1341d3e4cbe6934d446
+  data.tar.gz: daa100d2ce022f1077b3007aa6d0354bd5879f2ee5e5e67bd82caaced05541a4b22e93b7e3e12a44d73ad9a0f3e667f43c8831cf69eda43ec7f11d92111f6362

data/lib/mediawiki_selenium/support/env.rb

@@ -19,11 +19,11 @@ require "yaml"
 
 World(PageObject::PageFactory)
 
-def browser(environment, test_name, language)
+def browser(test_name, configuration = nil)
   if environment == :saucelabs
-    sauce_browser(test_name, language)
+    sauce_browser(test_name, configuration)
   else
-    local_browser(language)
+    local_browser(configuration)
   end
 end
 def environment
@@ -33,14 +33,14 @@ def environment
     :local
   end
 end
-def local_browser(language)
+def local_browser(configuration)
   if ENV["BROWSER"]
     browser_name = ENV["BROWSER"].to_sym
   else
     browser_name = :firefox
   end
 
-  if language == "default" && ENV["BROWSER_TIMEOUT"] && browser_name == :firefox
+  if ENV["BROWSER_TIMEOUT"] && browser_name == :firefox
     timeout = ENV["BROWSER_TIMEOUT"].to_i
 
     client = Selenium::WebDriver::Remote::Http::Default.new
@@ -50,24 +50,23 @@ def local_browser(language)
     profile["dom.max_script_run_time"] = timeout
     profile["dom.max_chrome_script_run_time"] = timeout
     browser = Watir::Browser.new browser_name, :http_client => client, :profile => profile
-  elsif language == "default"
-    browser = Watir::Browser.new browser_name
+  elsif configuration && configuration[:language] && browser_name == :firefox
+    profile = Selenium::WebDriver::Firefox::Profile.new
+    profile["intl.accept_languages"] = configuration[:language]
+    browser = Watir::Browser.new browser_name, profile: profile
+  elsif configuration && configuration[:language] && browser_name == :chrome
+    prefs = {intl: {accept_languages: configuration[:language]}}
+    browser = Watir::Browser.new browser_name, prefs: prefs
+  elsif configuration && configuration[:language] && browser_name == :phantomjs
+    capabilities = Selenium::WebDriver::Remote::Capabilities.phantomjs
+    capabilities["phantomjs.page.customHeaders.Accept-Language"] = configuration[:language]
+    browser = Watir::Browser.new browser_name, desired_capabilities: capabilities
+  elsif configuration && configuration[:user_agent] && browser_name == :firefox
+    profile = Selenium::WebDriver::Firefox::Profile.new
+    profile["general.useragent.override"] = configuration[:user_agent]
+    browser = Watir::Browser.new browser_name, profile: profile
   else
-    if browser_name == :firefox
-      profile = Selenium::WebDriver::Firefox::Profile.new
-      profile["intl.accept_languages"] = language
-      browser = Watir::Browser.new browser_name, profile: profile
-    elsif browser_name == :chrome
-      profile = Selenium::WebDriver::Chrome::Profile.new
-      profile["intl.accept_languages"] = language
-      browser = Watir::Browser.new browser_name, profile: profile
-    elsif browser_name == :phantomjs
-      capabilities = Selenium::WebDriver::Remote::Capabilities.phantomjs
-      capabilities["phantomjs.page.customHeaders.Accept-Language"] = language
-      browser = Watir::Browser.new browser_name, desired_capabilities: capabilities
-    else
-      raise "Changing default language is currently supported only for Chrome, Firefox and PhantomJS!"
-    end
+    browser = Watir::Browser.new browser_name
   end
 
   browser.window.resize_to 1280, 1024
@@ -83,13 +82,13 @@ RestClient::Request.execute(
   :payload => json
 )
 end
-def sauce_browser(test_name, language)
+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)
 
   require "selenium/webdriver/remote/http/persistent" # http_client
   client = Selenium::WebDriver::Remote::Http::Persistent.new
 
-  if language == "default" && ENV["BROWSER_TIMEOUT"] && ENV["BROWSER"] == "firefox"
+  if ENV["BROWSER_TIMEOUT"] && ENV["BROWSER"] == "firefox"
     timeout = ENV["BROWSER_TIMEOUT"].to_i
     client.timeout = timeout
 
@@ -97,16 +96,20 @@ def sauce_browser(test_name, language)
     profile["dom.max_script_run_time"] = timeout
     profile["dom.max_chrome_script_run_time"] = timeout
     caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile => profile)
-  elsif language == "default"
-    caps = Selenium::WebDriver::Remote::Capabilities.send(ENV["BROWSER"])
-  elsif ENV["BROWSER"] == "firefox"
+  elsif configuration && configuration[:language] && ENV["BROWSER"] == "firefox"
     profile = Selenium::WebDriver::Firefox::Profile.new
-    profile["intl.accept_languages"] = language
+    profile["intl.accept_languages"] = configuration[:language]
     caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile => profile)
-  elsif ENV["BROWSER"] == "chrome"
+  elsif configuration && configuration[:language] && ENV["BROWSER"] == "chrome"
     profile = Selenium::WebDriver::Chrome::Profile.new
-    profile["intl.accept_languages"] = language
+    profile["intl.accept_languages"] = configuration[:language]
     caps = Selenium::WebDriver::Remote::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)
+  else
+    caps = Selenium::WebDriver::Remote::Capabilities.send(ENV["BROWSER"])
   end
 
   caps.platform = ENV["PLATFORM"]

data/lib/mediawiki_selenium/support/hooks.rb

@@ -26,7 +26,7 @@ Before do |scenario|
   elsif scenario.source_tag_names.include? "@custom-browser"
     # browser will be started in Cucumber step
   else
-    @browser = browser(environment, test_name(scenario), "default")
+    @browser = browser(test_name(scenario))
     $browser = @browser # CirrusSearch and VisualEditor need this
     $session_id = @browser.driver.instance_variable_get(:@bridge).session_id
   end

data/lib/mediawiki_selenium/version.rb

@@ -10,5 +10,5 @@ https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
 =end
 
 module MediawikiSelenium
-  VERSION = "0.2.12"
+  VERSION = "0.2.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediawiki_selenium
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Chris McMahon
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber