Merge branch 'rubocop' into 'master'

Style fixes based on Rubocop

See merge request leap/nickserver!19

1 files changed, 7 insertions, 9 deletions

diff --git a/test/support/functional_test.rb b/test/support/functional_test.rb
index 4ebc40a..ceabfea 100644
--- a/test/support/functional_test.rb
+++ b/test/support/functional_test.rb
@@ -2,28 +2,27 @@ require 'minitest/autorun'
 require 'minitest/pride'
 
 class FunctionalTest < Minitest::Test
-
   protected
 
   def nickserver_pid
-    status = nickserver "status"
+    status = nickserver 'status'
     /process id (\d*)\./.match(status)[1]
   end
 
   def assert_running
-    status = nickserver "status"
-    assert_includes status, "Nickserver running"
+    status = nickserver 'status'
+    assert_includes status, 'Nickserver running'
   end
 
   def assert_stopped
-    status = nickserver "status"
-    assert_includes status, "No nickserver processes are running."
+    status = nickserver 'status'
+    assert_includes status, 'No nickserver processes are running.'
   end
 
   def assert_command_runs(command)
     out = nickserver command
-    assert ($?.exitstatus == 0),
-      "failed to run 'nickserver #{command}':\n #{out}"
+    assert ($CHILD_STATUS.exitstatus == 0),
+           "failed to run 'nickserver #{command}':\n #{out}"
   end
 
   def nickserver(command)
@@ -37,5 +36,4 @@ class FunctionalTest < Minitest::Test
   def self.path_to_executable
     File.expand_path(File.dirname(__FILE__) + '/../../bin/nickserver')
   end
-
 end