mediawiki_selenium 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffe8c78e34aa74ad81455f7682b541885e0a878a
-  data.tar.gz: 93121410f05587f7af508b7c650c6feeb0421d07
+  metadata.gz: ee99172f7f9d82c758784d478f8625a4da70da6d
+  data.tar.gz: c6dd15b10dc2459bb1cad21c94fbbc1fcc3b7350
 SHA512:
-  metadata.gz: 726c8fa919d9375d9ade8a953080cfd7bb89fa14373f3c3cbfca2028f738c32657403ee2e1b69f645c0da73540c19ea3b12646a0bbc23741bbf0ef9967f5156c
-  data.tar.gz: 31e9d6c33688e8d7fd576fd2c38dba7d23a3da2b05bef915a6edecf21c29ebd42c7fa54732cf432ccf45182f0e873260af96f02a20e17527e7d019a5c21dcc71
+  metadata.gz: 848bdc8e955e9c7feb557be58427f657e15b8e9aef49bf06b0ff44d3b2024a538445db2a5d02cda6a87991283a8e0f4dd1ff335d7c7a595cbc82ea598b00fcff
+  data.tar.gz: 657777516a2640f399671d905219cea20e9e5f893279cd0289df0ef001c55f70e9c565759a97131d1e1c08f3bf46d1a4e4149fa579c2db7b93e05ac483731a37

data/README.md

@@ -37,10 +37,10 @@ To run a single test file enter `bundle exec cucumber features/FEATURE_NAME.feat
 
 To run a single test scenario, put a colon and the line number (NN) on which the scenario begins after the file name: `bundle exec cucumber features/FEATURE_NAME.feature:NN`.
 
-You can use a different browser with the BROWSER_LABEL env variable, the fastest is probably PhantomJS, a headless browser:
+You can use a different browser with the `BROWSER` env variable, the fastest is probably PhantomJS, a headless browser:
 
-    export BROWSER_LABEL=phantomjs # Linux/Unix/Mac
-    set BROWSER_LABEL=phantomjs # Windows
+    export BROWSER=phantomjs # Linux/Unix/Mac
+    set BROWSER=phantomjs # Windows
 
 By default, the browser will close itself at the end of every scenario. If you want the browser to stay open, set the environment variable `KEEP_BROWSER_OPEN` to `true`:
 
@@ -77,10 +77,9 @@ Repositories that use the gem:
 6. Translate: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Translate), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Translate), [Jenkins](https://wmf.ci.cloudbees.com/view/r-tr/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Translate)
 7. TwnMainPage: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/TwnMainPage), [GitHub](https://github.com/wikimedia/mediawiki-extensions-TwnMainPage), [Jenkins](https://wmf.ci.cloudbees.com/view/r-tw/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-TwnMainPage)
 8. UniversalLanguageSelector: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/UniversalLanguageSelector), [GitHub](https://github.com/wikimedia/mediawiki-extensions-UniversalLanguageSelector), [Jenkins](https://wmf.ci.cloudbees.com/view/r-uls/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-UniversalLanguageSelector)
-9. UploadWizard: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/UploadWizard), [GitHub](https://github.com/wikimedia/mediawiki-extensions-UploadWizard), [Jenkins](https://wmf.ci.cloudbees.com/view/r-uw/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-UploadWizard)
-10. VisualEditor: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/VisualEditor), [GitHub](https://github.com/wikimedia/mediawiki-extensions-VisualEditor), [Jenkins](https://wmf.ci.cloudbees.com/view/r-ve/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-VisualEditor), `/modules/ve-mw/test/browser` folder
-11. Wikibase: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Wikibase), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Wikibase), [Jenkins](https://wikidata-cloudbees.ci.cloudbees.com/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Wikibase)
-12. browsertests: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/qa/browsertests), [GitHub](https://github.com/wikimedia/qa-browsertests), [Jenkins](https://wmf.ci.cloudbees.com/view/r-bt/), [Code Climate](https://codeclimate.com/github/wikimedia/qa-browsertests)
+9. VisualEditor: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/VisualEditor), [GitHub](https://github.com/wikimedia/mediawiki-extensions-VisualEditor), [Jenkins](https://wmf.ci.cloudbees.com/view/r-ve/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-VisualEditor), `/modules/ve-mw/test/browser` folder
+10. Wikibase: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Wikibase), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Wikibase), [Jenkins](https://wikidata-cloudbees.ci.cloudbees.com/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Wikibase)
+11. browsertests: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/qa/browsertests), [GitHub](https://github.com/wikimedia/qa-browsertests), [Jenkins](https://wmf.ci.cloudbees.com/view/r-bt/), [Code Climate](https://codeclimate.com/github/wikimedia/qa-browsertests)
 
 ## Contributing
 

data/docs/job.md

@@ -14,7 +14,7 @@
     export MEDIAWIKI_USER=${MEDIAWIKI_USER}
     export MEDIAWIKI_PASSWORD_VARIABLE=${MEDIAWIKI_PASSWORD_VARIABLE}
 
-    export BROWSER_LABEL=${BROWSER_LABEL}
+    export BROWSER=${browser}
     export MEDIAWIKI_URL=http://${MEDIAWIKI_URL}/wiki/
 
     curl -s -o use-ruby https://repository-cloudbees.forge.cloudbees.com/distributions/ci-addons/ruby/use-ruby

data/docs/jobs.md

@@ -17,6 +17,25 @@
 - MediaWiki user: Selenium_user
 
 
+# browsertests-commons.wikimedia.beta.wmflabs.org
+- MediaWiki URL: commons.wikimedia.beta.wmflabs.org
+- bundle exec cucumber: --tags @commons.wikimedia.beta.wmflabs.org
+- MediaWiki password variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
+
+## browsertests-commons.wikimedia.beta.wmflabs.org-linux-chrome
+- Browser Label: chrome
+
+## browsertests-commons.wikimedia.beta.wmflabs.org-linux-firefox
+- Browser Label: firefox
+
+## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_9
+- Browser Label: internet_explorer_9
+
+## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_10
+- Browser Label: internet_explorer_10
+
+
+
 # browsertests-en.wikipedia.beta.wmflabs.org
 - bundle exec cucumber: --tags @en.wikipedia.beta.wmflabs.org
 - MediaWiki URL: en.wikipedia.beta.wmflabs.org
@@ -47,6 +66,7 @@
 - Browser Label: internet_explorer_10
 
 
+
 # browsertests-test2.wikipedia.org
 - bundle exec cucumber: --tags @test2.wikipedia.org
 - MediaWiki URL: test2.wikipedia.org
@@ -86,6 +106,7 @@
 - MediaWiki user: Selenium_user
 - MediaWiki password variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
 
+
 ## Flow-en.wikipedia.beta.wmflabs.org-linux-chrome
 - Browser Label: chrome
 
@@ -158,6 +179,7 @@
 
 # TwnMainPage
 
+
 ## TwnMainPage-sandbox.translatewiki.net-linux-firefox
 - Browser Label: firefox
 - bundle exec cucumber: --tags @sandbox.translatewiki.net
@@ -169,11 +191,13 @@
 
 
 
+
 # UniversalLanguageSelector
 - Browser Label: firefox
 - Recipients: aaharoni@wikimedia.org cmcmahon@wikimedia.org nlaxstrom@wikimedia.org sthottingal@wikimedia.org zfilipin@wikimedia.org
 - Repository URL: UniversalLanguageSelector
 
+
 ## UniversalLanguageSelector-commons.wikimedia.beta.wmflabs.org-linux-firefox
 - bundle exec cucumber: --tags @commons.wikimedia.beta.wmflabs.org
 - MediaWiki URL: commons.wikimedia.beta.wmflabs.org
@@ -194,35 +218,12 @@
 
 
 
-# UploadWizard
-
-# UploadWizard-commons.wikimedia.beta.wmflabs.org
-- bundle exec cucumber: --tags @commons.wikimedia.beta.wmflabs.org
-- Recipients: cmcmahon@wikimedia.org zfilipin@wikimedia.org
-- MediaWiki URL: commons.wikimedia.beta.wmflabs.org
-- Repository URL: UploadWizard
-- MediaWiki user: Selenium_user
-- MediaWiki password variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
-
-## UploadWizard-commons.wikimedia.beta.wmflabs.org-linux-chrome
-- Browser Label: chrome
-
-## UploadWizard-commons.wikimedia.beta.wmflabs.org-linux-firefox
-- Browser Label: firefox
-
-## UploadWizard-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_9
-- Browser Label: internet_explorer_9
-
-## UploadWizard-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_10
-- Browser Label: internet_explorer_10
-
-
-
 # VisualEditor
 - Folder: modules/ve-mw/test/browser/
 - Repository URL: VisualEditor
 - MediaWiki user: Selenium_user
 
+
 ## VisualEditor-en.wikipedia.beta.wmflabs.org-linux-chrome
 - Browser Label: chrome
 - bundle exec cucumber: --tags @en.wikipedia.beta.wmflabs.org

data/docs/template.md

@@ -14,10 +14,10 @@
 - Display Name: Name
 - Type: Text-field
 
-## Browser Label
+## Browser
 
-- ID: BROWSER_LABEL
-- Display Name: Browser Label
+- ID: BROWSER
+- Display Name: Browser
 - Type: Select a string among many
 - UI Mode: Dropdown list (no inline help, but more compact UI)
 - Options
@@ -76,21 +76,12 @@
   - Display Name: UniversalLanguageSelector
   - Value: https://gerrit.wikimedia.org/r/mediawiki/extensions/UniversalLanguageSelector
 
-  - Display Name: UploadWizard
-  - Value: https://gerrit.wikimedia.org/r/mediawiki/extensions/UploadWizard
-
   - Display Name: VisualEditor
   - Value: https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
 
   - Display Name: Wikibase
   - Value: https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase
 
-  - Display Name: WikiLove
-  - Value: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikiLove
-
-  - Display Name: ZeroRatedMobileAccess
-  - Value: https://gerrit.wikimedia.org/r/mediawiki/extensions/ZeroRatedMobileAccess
-
   - Display Name: browsertests
   - Value: https://gerrit.wikimedia.org/r/qa/browsertests
 
@@ -234,7 +225,7 @@
             export MEDIAWIKI_USER=${MEDIAWIKI_USER}
             export MEDIAWIKI_PASSWORD_VARIABLE=${MEDIAWIKI_PASSWORD_VARIABLE}
 
-            export BROWSER_LABEL=${BROWSER_LABEL}
+            export BROWSER=${BROWSER}
             export MEDIAWIKI_URL=http://${MEDIAWIKI_URL}/wiki/
 
             curl -s -o use-ruby https://repository-cloudbees.forge.cloudbees.com/distributions/ci-addons/ruby/use-ruby

data/lib/mediawiki_selenium/support/env.rb

@@ -27,7 +27,7 @@ def browser(environment, test_name, language)
   end
 end
 def environment
-  if ENV["BROWSER_LABEL"] and ENV["BROWSER_LABEL"] != "phantomjs" and
+  if ENV["BROWSER"] and ENV["BROWSER"] != "phantomjs" and
       ENV["SAUCE_ONDEMAND_USERNAME"] and ENV["SAUCE_ONDEMAND_ACCESS_KEY"]
     :saucelabs
   else
@@ -35,27 +35,27 @@ def environment
   end
 end
 def local_browser(language)
-  if ENV["BROWSER_LABEL"]
-    browser_label = ENV["BROWSER_LABEL"].to_sym
+  if ENV["BROWSER"]
+    browser_name = ENV["BROWSER"].to_sym
   else
-    browser_label = :firefox
+    browser_name = :firefox
   end
 
   if language == "default"
-    browser = Watir::Browser.new browser_label
+    browser = Watir::Browser.new browser_name
   else
-    if browser_label == :firefox
+    if browser_name == :firefox
       profile = Selenium::WebDriver::Firefox::Profile.new
       profile["intl.accept_languages"] = language
-      browser = Watir::Browser.new browser_label, profile: profile
-    elsif browser_label == :chrome
+      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_label, profile: profile
-    elsif browser_label == :phantomjs
+      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_label, desired_capabilities: capabilities
+      browser = Watir::Browser.new browser_name, desired_capabilities: capabilities
     else
       raise "Changing default language is currently supported only for Chrome, Firefox and PhantomJS!"
     end
@@ -75,59 +75,22 @@ RestClient::Request.execute(
 )
 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

data/lib/mediawiki_selenium/support/hooks.rb

@@ -9,10 +9,6 @@ mediawiki_selenium top-level directory and at
 https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
 =end
 
-Before("@custom-browser") do |scenario|
-  @scenario = scenario
-end
-
 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"]
@@ -23,12 +19,12 @@ Before do |scenario|
   @random_string = Random.new.rand.to_s
   if ENV["REUSE_BROWSER"] == "true" and $browser # CirrusSearch and VisualEditor need this
     @browser = $browser
-  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 # CirrusSearch and VisualEditor need this
-    $session_id = @browser.driver.instance_variable_get(:@bridge).session_id
+    unless @language or @user_agent # only UniversalLanguageSelector needs @language, only MobileFrontend needs @user_agent
+      @browser = browser(environment, test_name(scenario), "default")
+      $browser = @browser # CirrusSearch and VisualEditor need this
+      $session_id = @browser.driver.instance_variable_get(:@bridge).session_id
+    end
   end
 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.5"
+  VERSION = "0.2.6"
 end

metadata

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