X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/41326fd6d48749c6e81322e3c4c4765a51aa490f..d66b4b3d2f379ed61ef2b33bb2b0507267827f98:/test/application_system_test_case.rb?ds=sidebyside

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index df67ac914..f39fc8d1d 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -6,11 +6,13 @@ 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"] = "offscreen"
+ENV["QT_QPA_PLATFORM"] = "phantom" if IO.popen(["phantomjs", "--version"], :err => :close).read.empty?
 
-class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+ActiveSupport.on_load(:action_dispatch_system_test_case) do
   ActionDispatch::SystemTesting::Server.silence_puma = true
+end
 
+class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   driven_by :poltergeist, :screen_size => [1400, 1400]
 
   def initialize(*args)