From ed01bbed4e1bce3d3b245262faa69d81a8dfd7c8 Mon Sep 17 00:00:00 2001
From: Thibault Jouan <tj@a13.fr>
Date: Fri, 3 Apr 2015 16:12:47 +0000
Subject: [PATCH] Merge cucumber env setup in a unique file

---
 features/support/env.rb               | 19 ++++++++++++++++---
 features/support/env_aruba_timeout.rb |  3 ---
 features/support/env_fake_home.rb     |  3 ---
 3 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 features/support/env_aruba_timeout.rb
 delete mode 100644 features/support/env_fake_home.rb

diff --git a/features/support/env.rb b/features/support/env.rb
index 86d4b19..29f7146 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -2,7 +2,6 @@ require 'aruba/cucumber'
 require 'aruba/in_process'
 require 'producer/core'
 
-
 class ArubaProgramWrapper
   def initialize(argv, stdin = $stdin, stdout = $stdout, stderr = $stderr,
     kernel = Kernel)
@@ -23,11 +22,13 @@ class ArubaProgramWrapper
 end
 
 
+# Raise aruba default timeout so test suite can run on a slow machine.
 Before do
-  @_sshd_fast = true
+  @aruba_timeout_seconds = 8
 end
-require 'cucumber/sshd/cucumber'
 
+# Use aruba "in process" optimization only for scenarios not tagged @exec.
+# We need a real process in a few cases: real program name, interactive usage…
 Before('@exec') do
   Aruba.process = Aruba::SpawnProcess
 end
@@ -36,3 +37,15 @@ Before('~@exec') do
   Aruba::InProcess.main_class = ArubaProgramWrapper
   Aruba.process = Aruba::InProcess
 end
+
+# Fake home directory for @fake_home tagged scenarios.
+Before('@fake_home') do
+  ENV['HOME'] = File.expand_path(current_dir)
+end
+
+# Enable cucumber-sshd "fast" mode (persists sshd across scenarios), and
+# register hooks for @sshd tagged scenarios.
+Before do
+  @_sshd_fast = true
+end
+require 'cucumber/sshd/cucumber'
diff --git a/features/support/env_aruba_timeout.rb b/features/support/env_aruba_timeout.rb
deleted file mode 100644
index 909e484..0000000
--- a/features/support/env_aruba_timeout.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-Before do
-  @aruba_timeout_seconds = 8
-end
diff --git a/features/support/env_fake_home.rb b/features/support/env_fake_home.rb
deleted file mode 100644
index ee81e4f..0000000
--- a/features/support/env_fake_home.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-Before('@fake_home') do
-  ENV['HOME'] = File.expand_path(current_dir)
-end