jenkins-bot has submitted this change and it was merged.

Change subject: Using the new way of starting a custom browser
......................................................................


Using the new way of starting a custom browser

mediawiki_selenium Ruby gem is now able to start local and remote browsers with
optional browser setup.

Paired with Kartik Mistry.

Bug: 62512
Change-Id: I61e5b688711b1976e8df8be94972fe35f6eeb9aa
---
M tests/browser/Gemfile.lock
M tests/browser/features/accept_language.feature
M tests/browser/features/step_definitions/accept_language_steps.rb
3 files changed, 10 insertions(+), 10 deletions(-)

Approvals:
  KartikMistry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 5cd5194..2fa47e5 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -4,17 +4,17 @@
     builder (3.2.2)
     childprocess (0.5.1)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.11)
+    cucumber (1.3.12)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
+      multi_test (>= 0.1.1)
     data_magic (0.18)
       faker (>= 1.1.2)
       yml_reader (>= 0.2)
     diff-lcs (1.2.5)
-    faker (1.2.0)
+    faker (1.3.0)
       i18n (~> 0.5)
     ffi (1.9.3)
     gherkin (2.12.2)
@@ -22,7 +22,7 @@
     headless (1.0.1)
     i18n (0.6.9)
     json (1.8.1)
-    mediawiki_selenium (0.2.9)
+    mediawiki_selenium (0.2.13)
       cucumber (~> 1.3, >= 1.3.10)
       headless (~> 1.0, >= 1.0.1)
       json (~> 1.8, >= 1.8.1)
@@ -31,11 +31,11 @@
       rest-client (~> 1.6, >= 1.6.7)
       rspec-expectations (~> 2.14, >= 2.14.4)
       syntax (~> 1.2, >= 1.2.0)
-    mime-types (2.1)
+    mime-types (2.2)
     multi_json (1.9.0)
-    multi_test (0.0.3)
+    multi_test (0.1.1)
     net-http-persistent (2.9.4)
-    page-object (0.9.7)
+    page-object (0.9.8)
       page_navigation (>= 0.9)
       selenium-webdriver (>= 2.40.0)
       watir-webdriver (>= 0.6.8)
@@ -45,7 +45,7 @@
       mime-types (>= 1.16)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rubyzip (1.1.0)
+    rubyzip (1.1.2)
     selenium-webdriver (2.40.0)
       childprocess (>= 0.5.0)
       multi_json (~> 1.0)
diff --git a/tests/browser/features/accept_language.feature 
b/tests/browser/features/accept_language.feature
index f8c982d..8c65bf3 100644
--- a/tests/browser/features/accept_language.feature
+++ b/tests/browser/features/accept_language.feature
@@ -1,4 +1,4 @@
-@custom-browser @phantomjs-bug @sandbox.translatewiki.net
+@custom-browser @sandbox.translatewiki.net
 Feature: Accept-Language
 
   Scenario Outline: Accept-Language
diff --git a/tests/browser/features/step_definitions/accept_language_steps.rb 
b/tests/browser/features/step_definitions/accept_language_steps.rb
index 4579f51..012debd 100644
--- a/tests/browser/features/step_definitions/accept_language_steps.rb
+++ b/tests/browser/features/step_definitions/accept_language_steps.rb
@@ -1,5 +1,5 @@
 Given(/^that my browser's accept language is (.+)$/) do |language|
-  @browser = browser(environment, test_name(@scenario), language)
+  @browser = browser(test_name(@scenario), {language: language})
   $session_id = @browser.driver.instance_variable_get(:@bridge).session_id
 end
 

-- 
To view, visit https://gerrit.wikimedia.org/r/119270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I61e5b688711b1976e8df8be94972fe35f6eeb9aa
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <zfili...@wikimedia.org>
Gerrit-Reviewer: Amire80 <amir.ahar...@mail.huji.ac.il>
Gerrit-Reviewer: Cmcmahon <cmcma...@wikimedia.org>
Gerrit-Reviewer: Jeremylee <jeremygraja...@gmail.com>
Gerrit-Reviewer: KartikMistry <kartik.mis...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to