jenkins-bot has submitted this change and it was merged. Change subject: Move BROWSER_TIMEOUT implementation to mediawiki_selenium 0.2.8 gem ......................................................................
Move BROWSER_TIMEOUT implementation to mediawiki_selenium 0.2.8 gem Paired with Tobi Gritschacher. Bug: 61667 Change-Id: Ieb42faf5037c63dbc72755254acb73552d26ec02 --- M tests/browser/Gemfile.lock D tests/browser/config/browsers.yml M tests/browser/features/support/env.rb 3 files changed, 24 insertions(+), 183 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock index d986100..83d3cc3 100644 --- a/tests/browser/Gemfile.lock +++ b/tests/browser/Gemfile.lock @@ -1,23 +1,23 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.0.2) + activesupport (4.0.3) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - atomic (1.1.14) + atomic (1.1.15) builder (3.2.2) - childprocess (0.4.0) + childprocess (0.5.1) ffi (~> 1.0, >= 1.0.11) - cucumber (1.3.10) + cucumber (1.3.11) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.0.2) - data_magic (0.17) + data_magic (0.18) faker (>= 1.1.2) yml_reader (>= 0.2) diff-lcs (1.2.5) @@ -32,24 +32,24 @@ headless (1.0.1) i18n (0.6.9) json (1.8.1) - mediawiki_selenium (0.2.0) - cucumber (~> 1.3.10) - headless (~> 1.0.1) - json (~> 1.8.1) - net-http-persistent (~> 2.9.1) - page-object (~> 0.9.5) - rest-client (~> 1.6.7) - rspec-expectations (~> 2.14.4) - syntax (~> 1.2.0) + mediawiki_selenium (0.2.8) + cucumber (~> 1.3, >= 1.3.10) + headless (~> 1.0, >= 1.0.1) + json (~> 1.8, >= 1.8.1) + net-http-persistent (~> 2.9, >= 2.9.1) + page-object (~> 0.9, >= 0.9.5) + rest-client (~> 1.6, >= 1.6.7) + rspec-expectations (~> 2.14, >= 2.14.4) + syntax (~> 1.2, >= 1.2.0) mime-types (2.1) minitest (4.7.5) - multi_json (1.8.2) + multi_json (1.9.0) multi_test (0.0.3) - net-http-persistent (2.9.3) - page-object (0.9.6) + net-http-persistent (2.9.4) + page-object (0.9.7) page_navigation (>= 0.9) - selenium-webdriver (>= 2.39.0) - watir-webdriver (>= 0.6.7) + selenium-webdriver (>= 2.40.0) + watir-webdriver (>= 0.6.8) page_navigation (0.9) data_magic (>= 0.14) require_all (1.3.2) @@ -58,16 +58,16 @@ rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) rubyzip (1.1.0) - selenium-webdriver (2.39.0) - childprocess (>= 0.2.5) + selenium-webdriver (2.40.0) + childprocess (>= 0.5.0) multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0.4) syntax (1.2.0) - thread_safe (0.1.3) - atomic + thread_safe (0.2.0) + atomic (>= 1.1.7, < 2) tzinfo (0.3.38) - watir-webdriver (0.6.7) + watir-webdriver (0.6.8) selenium-webdriver (>= 2.18.0) websocket (1.0.7) yml_reader (0.2) diff --git a/tests/browser/config/browsers.yml b/tests/browser/config/browsers.yml deleted file mode 100644 index a02c23b..0000000 --- a/tests/browser/config/browsers.yml +++ /dev/null @@ -1,74 +0,0 @@ -chrome_linux: - name: chrome - platform: Linux - version: - -chrome_win: - name: chrome - platform: Windows 7 - version: - -chrome_mac: - name: chrome - platform: OS X 10.8 - version: - -firefox_linux: - name: firefox - platform: Linux - version: 25 - -firefox_win: - name: firefox - platform: Windows 7 - version: 25 - -firefox_mac: - name: firefox - platform: OS X 10.6 - version: 21 - -safari_5: - name: safari - platform: OS X 10.6 - version: 5 - -safari_6: - name: safari - platform: OS X 10.8 - version: 6 - -ie_6: - name: internet_explorer - platform: Windows XP - version: 6 - -ie_7: - name: internet_explorer - platform: Windows XP - version: 7 - -ie_8: - name: internet_explorer - platform: Windows 7 - version: 8 - -ie_9: - name: internet_explorer - platform: Windows 7 - version: 9 - -ie_10: - name: internet_explorer - platform: Windows 8 - version: 10 - -opera_linux: - name: opera - platform: Linux - version: 12 - -opera_win: - name: opera - platform: Windows 7 - version: 12 diff --git a/tests/browser/features/support/env.rb b/tests/browser/features/support/env.rb index c5a24ea..9519320 100644 --- a/tests/browser/features/support/env.rb +++ b/tests/browser/features/support/env.rb @@ -24,91 +24,6 @@ require_all "features/support/pages" require_all "features/support/utils" -def sauce_browser(test_name, language) - browsers = YAML.load_file("config/browsers.yml") - if ENV["BROWSER_LABEL"] - browser_label = browsers[ENV["BROWSER_LABEL"]] - else - browser_label = browsers["firefox_linux"] - end - - require "selenium/webdriver/remote/http/persistent" # http_client - client = Selenium::WebDriver::Remote::Http::Persistent.new - - if ENV["BROWSER_TIMEOUT"] && browser_label['name'] == 'firefox' - timeout = ENV["BROWSER_TIMEOUT"].to_i - client.timeout = timeout - end - - if browser_label['name'] == 'firefox' - profile = Selenium::WebDriver::Firefox::Profile.new - if timeout - profile["dom.max_script_run_time"] = timeout - profile["dom.max_chrome_script_run_time"] = timeout - end - profile['intl.accept_languages'] = language - caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile => profile) - elsif browser_label['name'] == 'chrome' - profile = Selenium::WebDriver::Chrome::Profile.new - profile['intl.accept_languages'] = language - caps = Selenium::WebDriver::Remote::Capabilities.chrome('chrome.profile' => profile.as_json['zip']) - else - caps = Selenium::WebDriver::Remote::Capabilities.send(browser_label['name']) - end - - caps.platform = browser_label["platform"] - caps.version = browser_label["version"] - caps[:name] = "#{test_name} #{ENV["JOB_NAME"]}" - - 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";, - desired_capabilities: caps) - - browser -end - -def local_browser(language) - if ENV["BROWSER_LABEL"] - browser_label = ENV["BROWSER_LABEL"].to_sym - else - browser_label = :firefox - end - - client = Selenium::WebDriver::Remote::Http::Default.new - profile = Selenium::WebDriver::Firefox::Profile.new - - if ENV["BROWSER_TIMEOUT"] && browser_label == :firefox - timeout = ENV["BROWSER_TIMEOUT"].to_i - client.timeout = timeout - profile["dom.max_script_run_time"] = timeout - profile["dom.max_chrome_script_run_time"] = timeout - end - - if language == "default" - browser = Watir::Browser.new browser_label, :http_client => client, :profile => profile - else - if browser_label == :firefox - profile["intl.accept_languages"] = language - browser = Watir::Browser.new browser_label, :profile => profile, :http_client => client - elsif browser_label == :chrome - profile = Selenium::WebDriver::Chrome::Profile.new - profile["intl.accept_languages"] = language - browser = Watir::Browser.new browser_label, :profile => profile, :http_client => client - elsif browser_label == :phantomjs - capabilities = Selenium::WebDriver::Remote::Capabilities.phantomjs - capabilities["phantomjs.page.customHeaders.Accept-Language"] = language - browser = Watir::Browser.new browser_label, desired_capabilities: capabilities, :http_client => client - else - raise "Changing default language is currently supported only for Chrome, Firefox and PhantomJS!" - end - end - - browser.window.resize_to 1280, 1024 - browser -end - Before("@repo_login") do abort("WB_REPO_USERNAME environment variable is not defined! Please export a value for that variable before proceeding.") unless ENV["WB_REPO_USERNAME"] abort("WB_REPO_PASSWORD environment variable is not defined! Please export a value for that variable before proceeding.") unless ENV["WB_REPO_PASSWORD"] -- To view, visit https://gerrit.wikimedia.org/r/114454 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieb42faf5037c63dbc72755254acb73552d26ec02 Gerrit-PatchSet: 9 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Zfilipin <zfili...@wikimedia.org> Gerrit-Reviewer: Adrian Lang <adrian.l...@wikimedia.de> Gerrit-Reviewer: Cmcmahon <cmcma...@wikimedia.org> Gerrit-Reviewer: Jhall <jh...@wikimedia.org> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de> Gerrit-Reviewer: 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
