From: Tom Hughes <tom@compton.nu>
Date: Thu, 31 May 2018 23:41:29 +0000 (+0100)
Subject: Only set QT_QPA_PLATFORM if phantomjs fails without it
X-Git-Tag: live~2968
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2f342ba8e8e7b22be148bf2a90561e0c10eb6a23

Only set QT_QPA_PLATFORM if phantomjs fails without it
---

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index df67ac914..176f4903d 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -6,7 +6,7 @@ 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
   ActionDispatch::SystemTesting::Server.silence_puma = true