Extract user acceptance test helpers in a module

features/support/env.rb

@@ -1,6 +1,8 @@
 require 'aruba/cucumber'
 require 'headless'
 
+require 'uh/wm/testing/acceptance_helpers'
+
 module Aruba
   class SpawnProcess
     def pid
@@ -9,15 +11,14 @@ module Aruba
   end
 end
 
+World(Uh::WM::Testing::AcceptanceHelpers)
+
 Headless.new.start
 
 After do |scenario|
-  @process and @process.terminate
+  uhwm_ensure_stop
 end
 
 Around '@other_wm_running' do |scenario, block|
-  @other_wm = ChildProcess.build('twm')
-  @other_wm.start
-  block.call
-  @other_wm.stop
+  with_other_wm { block.call }
 end