Merge remote-tracking branch 'upstream/pull/1893'

[rails.git] / test / application_system_test_case.rb

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 18d5ec2f7dc41c9a010b43757042e524e6796c4d..176f4903d4be6f4f6d75f55352fcc4ed3c10d5b8 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -3,7 +3,14 @@ require "capybara/poltergeist"
 
 WebMock.disable_net_connect!(:allow_localhost => true)
 
+# Work around weird debian/ubuntu phantomjs
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817277
+# https://github.com/ariya/phantomjs/issues/14376
+ENV["QT_QPA_PLATFORM"] = "phantom" if IO.popen(["phantomjs", "--version"], :err => :close).read.empty?
+
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+  ActionDispatch::SystemTesting::Server.silence_puma = true
+
   driven_by :poltergeist, :screen_size => [1400, 1400]
 
   def initialize(*args)