use a controller method to handle cancan denials

[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 df67ac914ceb722a74faeea36c61a2dcca8d19d4..176f4903d4be6f4f6d75f55352fcc4ed3c10d5b8 100644 (file)
--- 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