1 files changed, 13 insertions, 13 deletions
diff --git a/actionview/Rakefile b/actionview/Rakefile
index de588ad25c..8650f541b0 100644
--- a/actionview/Rakefile
+++ b/actionview/Rakefile
@@ -1,9 +1,9 @@
+# frozen_string_literal: true
+
 require "rake/testtask"
 require "fileutils"
 require "open3"
 
-dir = File.dirname(__FILE__)
-
 desc "Default Task"
 task default: :test
 
@@ -32,12 +32,12 @@ namespace :test do
   task :ujs do
     begin
       Dir.mkdir("log")
-      pid = spawn("bundle exec rackup test/ujs/config.ru -p 4567 -s puma > log/test.log 2>&1")
+      pid = spawn("bundle exec rackup test/ujs/config.ru -p 4567 -s puma > log/test.log 2>&1", pgroup: true)
 
       start_time = Time.now
 
       loop do
-        break if system("lsof -i :4567 >/dev/null")
+        break if system("lsof -i :4567", 1 => File::NULL)
 
         if Time.now - start_time > 5
           puts "Timed out after 5 seconds"
@@ -45,11 +45,11 @@ namespace :test do
         end
       end
 
-      system("npm run lint && phantomjs ../ci/phantomjs.js http://localhost:4567/")
-      status = $?.to_i
+      system("npm run lint && bundle exec ruby ../ci/qunit-selenium-runner.rb http://localhost:4567/")
+      status = $?.exitstatus
     ensure
-      Process.kill("KILL", pid) if pid
-      FileUtils.rm_f("log")
+      Process.kill("KILL", -pid) if pid
+      FileUtils.rm_rf("log")
     end
 
     exit status
@@ -95,7 +95,7 @@ namespace :assets do
   desc "Verify compiled Action View assets"
   task :verify do
     file = "lib/assets/compiled/rails-ujs.js"
-    pathname = Pathname.new("#{dir}/#{file}")
+    pathname = Pathname.new("#{__dir__}/#{file}")
 
     print "[verify] #{file} exists "
     if pathname.exist?
@@ -113,13 +113,13 @@ namespace :assets do
       fail
     end
 
-    print "[verify] #{dir} can be required as a module "
+    print "[verify] #{__dir__} can be required as a module "
     js = <<-JS
       window = { Event: class {} }
       class Element {}
-      require('#{dir}')
+      require('#{__dir__}')
     JS
-    stdout, stderr, status = Open3.capture3("node", "--print", js)
+    _, stderr, status = Open3.capture3("node", "--print", js)
     if status.success?
       puts "[OK]"
     else
@@ -130,7 +130,7 @@ namespace :assets do
 end
 
 task :lines do
-  load File.expand_path("..", File.dirname(__FILE__)) + "/tools/line_statistics"
+  load File.join(File.expand_path("..", __dir__), "/tools/line_statistics")
   files = FileList["lib/**/*.rb"]
   CodeTools::LineStatistics.new(files).print_loc
 end