Merge "Fix Accept-Language feature for PhantomJS"

2013-12-14 11:35:13 +00:00
parent 2a365e2b79 7c8b976edb
commit 42a644f474
2 changed files with 3 additions and 4 deletions
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -21,7 +21,7 @@ GEM
      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 @@ GEM
      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)
--- 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