Simplify cucumber steps (uhwm process)

features/steps/x_steps.rb

@@ -33,7 +33,7 @@ end
 
 Then /^it must connect to X display$/ do
   uhwm_wait_output 'Connected to'
-  expect(x_socket_check uhwm_pid).to be true
+  expect(x_socket_check uhwm.pid).to be true
 end
 
 Then /^the window must be mapped$/ do

lib/uh/wm/testing/acceptance_helpers.rb

@@ -13,6 +13,10 @@ module Uh
           @interactive = @process = run command.join ' '
         end
 
+        def uhwm
+          @process
+        end
+
         def uhwm_request_quit
           x_key QUIT_KEYBINDING
         end
@@ -24,14 +28,6 @@ module Uh
           end
         end
 
-        def uhwm_pid
-          @process.pid
-        end
-
-        def uhwm_output
-          @process.stdout
-        end
-
         def uhwm_wait_output message
           output = -> { @process.stdout + @process.stderr }
           timeout_until do