summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-08-24 17:48:05 +0200
committeranonym <anonym@riseup.net>2016-08-24 17:48:05 +0200
commit730e684db568962dd0a96ca3a52f536e08ca4e0b (patch)
treee8eccad8abdcb8daf25f2883bbe5af57754bc7e1
parentd26b6def1622fe6ef04419b95f65e60d345d5c06 (diff)
parentbf988b88c224865e9f7de0cb0cde98892bc0ae4d (diff)
Merge remote-tracking branch 'origin/devel' into feature/stretch
-rw-r--r--features/localization.feature2
-rw-r--r--features/support/extra_hooks.rb4
2 files changed, 4 insertions, 2 deletions
diff --git a/features/localization.feature b/features/localization.feature
index 4ec4a05..2f36aa2 100644
--- a/features/localization.feature
+++ b/features/localization.feature
@@ -13,6 +13,8 @@ Feature: Localization
When I double-click the Report an Error launcher on the desktop
Then the support documentation page opens in Tor Browser
+ #11711
+ @fragile
Scenario: The Unsafe Browser can be used in all languages supported in Tails
Given I have started Tails from DVD and logged in and the network is connected
Then the Unsafe Browser works in all supported languages
diff --git a/features/support/extra_hooks.rb b/features/support/extra_hooks.rb
index 5994458..04526d5 100644
--- a/features/support/extra_hooks.rb
+++ b/features/support/extra_hooks.rb
@@ -133,8 +133,8 @@ module ExtraFormatters
# The pretty formatter with debug logging mixed into its output.
class PrettyDebug < Cucumber::Formatter::Pretty
- def initialize(*args)
- super(*args)
+ def initialize(runtime, io, options)
+ super(runtime, io, options)
$debug_log_fns ||= []
$debug_log_fns << self.method(:debug_log)
end