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

Change subject: Fix Accept-Language feature for PhantomJS
......................................................................


Fix Accept-Language feature for PhantomJS

mediawiki-selenium 0.1.15 is needed to make it work

Bug: 49813
Change-Id: I2e0e5d85e167e85262cb357f3a48f3336b848f6e
---
M tests/browser/Gemfile.lock
M tests/browser/features/accept_language.feature
2 files changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 130bf90..e069435 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -21,7 +21,7 @@
       multi_json (~> 1.3)
     i18n (0.6.9)
     json (1.8.1)
-    mediawiki-selenium (0.1.14)
+    mediawiki-selenium (0.1.15)
       cucumber
       json
       net-http-persistent
@@ -49,7 +49,7 @@
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0.4)
-    syntax (1.0.0)
+    syntax (1.1.0)
     watir-webdriver (0.6.4)
       selenium-webdriver (>= 2.18.0)
     websocket (1.0.7)
diff --git a/tests/browser/features/accept_language.feature 
b/tests/browser/features/accept_language.feature
index 7e7faaa..5abc2ae 100644
--- a/tests/browser/features/accept_language.feature
+++ b/tests/browser/features/accept_language.feature
@@ -1,5 +1,4 @@
-# On phantomjs, we need to figure out a way to pass the accept language header.
-@language @phantomjs-bug @sandbox.translatewiki.net
+@language @sandbox.translatewiki.net
 Feature: Accept-Language
 
   Scenario Outline: Accept-Language

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e0e5d85e167e85262cb357f3a48f3336b848f6e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: Jhall <[email protected]>
Gerrit-Reviewer: KartikMistry <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to