features/support/env.rb in lolcommits-0.3.1 vs features/support/env.rb in lolcommits-0.3.2.pre1

@@ -1,45 +1,37 @@
 require 'aruba/cucumber'
 require 'methadone/cucumber'
 require 'open3'
 require 'test/unit/assertions'
 include Test::Unit::Assertions
+require 'faker'
 
 ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')
 
 Before do
   # Using "announce" causes massive warnings on 1.9.2
   @puts = true
-  @original_rubylib = ENV['RUBYLIB']
   @aruba_timeout_seconds = 20
+
+  @original_rubylib = ENV['RUBYLIB']
   ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
 
   @original_fakecapture = ENV['LOLCOMMITS_FAKECAPTURE']
   ENV['LOLCOMMITS_FAKECAPTURE'] = "1"
 
-  @original_loldir = ENV['LOLCOMMITS_DIR']
-  ENV['LOLCOMMITS_DIR'] = File.expand_path( File.join(current_dir, ".lolcommits") )
+  # @original_loldir = ENV['LOLCOMMITS_DIR']
+  # ENV['LOLCOMMITS_DIR'] = File.expand_path( File.join(current_dir, ".lolcommits") )
 
+  @original_home = ENV['HOME']
+  ENV['HOME'] = File.expand_path( current_dir )
+
   ENV['LAUNCHY_DRY_RUN'] = 'true'
 end
 
 After do
   ENV['RUBYLIB'] = @original_rubylib
   ENV['LOLCOMMITS_FAKECAPTURE'] = @original_fakecapture
-  ENV['LOLCOMMITS_DIR'] = @original_loldir
+  # ENV['LOLCOMMITS_DIR'] = @original_loldir
+  ENV['HOME'] = @original_home
   ENV['LAUNCHY_DRY_RUN'] = nil
 end
-
-# ###moved the below into env for everything
-# Before('@simulate-env') do
-#   @original_fakecapture = ENV['LOLCOMMITS_FAKECAPTURE']
-#   ENV['LOLCOMMITS_FAKECAPTURE'] = "1"
-
-#   @original_loldir = ENV['LOLCOMMITS_DIR']
-#   ENV['LOLCOMMITS_DIR'] = File.join(current_dir, ".lolcommits")
-# end
-
-# After('@simulate-env') do
-#   ENV['LOLCOMMITS_FAKECAPTURE'] = @original_fakecapture
-#   ENV['LOLCOMMITS_DIR'] = @original_loldir
-# end