From 47887fc4c2d054e208095a28286fc761eae9fcfd Mon Sep 17 00:00:00 2001 From: Jim Deville Date: Thu, 10 Jul 2008 11:53:38 -0700 Subject: [PATCH] modified env specs for windows --- 1.8/core/env/clear_spec.rb | 1 - 1.8/core/env/fixtures/classes.rb | 9 +-------- 2 files changed, 1 insertions(+), 9 deletions(-) diff --git a/1.8/core/env/clear_spec.rb b/1.8/core/env/clear_spec.rb index 6b9e281..6a3a3da 100644 --- a/1.8/core/env/clear_spec.rb +++ b/1.8/core/env/clear_spec.rb @@ -2,7 +2,6 @@ require File.dirname(__FILE__) + '/../../spec_helper' require File.dirname(__FILE__) + '/fixtures/classes' describe "ENV.clear" do - it "deletes all environment variables" do orig = ENV.to_hash begin diff --git a/1.8/core/env/fixtures/classes.rb b/1.8/core/env/fixtures/classes.rb index 38bb885..aedf564 100644 --- a/1.8/core/env/fixtures/classes.rb +++ b/1.8/core/env/fixtures/classes.rb @@ -11,13 +11,6 @@ module EnvSpecs end def self.get_current_user - user = "" - platform_is_not :windows do - user = `whoami`.strip - end - platform_is :windows do - user = `cmd.exe /C ECHO %USERNAME%`.strip - end - user + `whoami`.strip.split("\\").last end end -- 1.5.5.1015.g9d258