3 files changed, 16 insertions, 16 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5d94f130c..e38d1e218 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -51,7 +51,7 @@ Spec::Runner.configure do |config|
                 if Puppet.features.posix? and file !~ /^\/tmp/ and file !~ /^\/var\/folders/
                     puts "Not deleting tmpfile #{file} outside of /tmp or /var/folders"
                     next
-                elsif Puppet.features.win32? 
+                elsif Puppet.features.microsoft_windows? 
                     tempdir = File.expand_path(File.join(Dir::LOCAL_APPDATA, "Temp"))
                     if file !~ /^#{tempdir}/
                         puts "Not deleting tmpfile #{file} outside of #{tempdir}"
diff --git a/spec/unit/type/file_spec.rb b/spec/unit/type/file_spec.rb
index 7014854c1..327044db6 100755
--- a/spec/unit/type/file_spec.rb
+++ b/spec/unit/type/file_spec.rb
@@ -156,7 +156,7 @@ describe Puppet::Type.type(:file) do
         describe "on POSIX systems" do
             before do
                 Puppet.features.stubs(:posix?).returns(true)
-                Puppet.features.stubs(:win32?).returns(false)
+                Puppet.features.stubs(:microsoft_windows?).returns(false)
             end
 
             it "should autorequire its parent directory" do
@@ -196,10 +196,10 @@ describe Puppet::Type.type(:file) do
             end
         end
         
-        describe "on Win32 systems" do
+        describe "on Microsoft Windows systems" do
             before do
                 Puppet.features.stubs(:posix?).returns(false)
-                Puppet.features.stubs(:win32?).returns(true)
+                Puppet.features.stubs(:microsoft_windows?).returns(true)
             end
 
             it "should refuse to work" do
@@ -208,12 +208,12 @@ describe Puppet::Type.type(:file) do
         end
     end
 
-    describe "when using Win32 filenames" do
-        confine "Only works on Win32" => Puppet.features.win32?
-        describe "on Win32 systems" do
+    describe "when using Microsoft Windows filenames" do
+        confine "Only works on Microsoft Windows" => Puppet.features.microsoft_windows?
+        describe "on Microsoft Windows systems" do
             before do
                 Puppet.features.stubs(:posix?).returns(false)
-                Puppet.features.stubs(:win32?).returns(true)
+                Puppet.features.stubs(:microsoft_windows?).returns(true)
             end
 
             it "should autorequire its parent directory" do
@@ -261,7 +261,7 @@ describe Puppet::Type.type(:file) do
         describe "on POSIX systems" do
             before do
                 Puppet.features.stubs(:posix?).returns(true)
-                Puppet.features.stubs(:win32?).returns(false)
+                Puppet.features.stubs(:microsoft_windows?).returns(false)
             end
 
             it "should refuse to work" do
@@ -271,11 +271,11 @@ describe Puppet::Type.type(:file) do
     end
 
     describe "when using UNC filenames" do
-        describe "on Win32 systems" do
-            confine "Only works on Win32" => Puppet.features.win32?
+        describe "on Microsoft Windows systems" do
+            confine "Only works on Microsoft Windows" => Puppet.features.microsoft_windows?
             before do
                 Puppet.features.stubs(:posix?).returns(false)
-                Puppet.features.stubs(:win32?).returns(true)
+                Puppet.features.stubs(:microsoft_windows?).returns(true)
             end
 
             it "should autorequire its parent directory" do
@@ -324,7 +324,7 @@ describe Puppet::Type.type(:file) do
         describe "on POSIX systems" do
             before do
                 Puppet.features.stubs(:posix?).returns(true)
-                Puppet.features.stubs(:win32?).returns(false)
+                Puppet.features.stubs(:microsoft_windows?).returns(false)
             end
 
             it "should refuse to work" do
@@ -407,10 +407,10 @@ describe Puppet::Type.type(:file) do
             # should recode tests using expectations instead of using the filesystem
         end
         
-        describe "on Win32 systems" do
+        describe "on Microsoft Windows systems" do
             before do
                 Puppet.features.stubs(:posix?).returns(false)
-                Puppet.features.stubs(:win32?).returns(true)
+                Puppet.features.stubs(:microsoft_windows?).returns(true)
             end
 
             it "should refuse to work with links"
diff --git a/spec/unit/util/settings/file_setting_spec.rb b/spec/unit/util/settings/file_setting_spec.rb
index a6b7f024b..55ad2df8e 100755
--- a/spec/unit/util/settings/file_setting_spec.rb
+++ b/spec/unit/util/settings/file_setting_spec.rb
@@ -147,7 +147,7 @@ describe Puppet::Util::Settings::FileSetting do
         end
 
         describe "on POSIX systems" do
-            confine "no /dev on Win32" => Puppet.features.posix?
+            confine "no /dev on Microsoft Windows" => Puppet.features.posix?
 
             it "should skip files in /dev" do
                 @settings.stubs(:value).with(:mydir).returns "/dev/file"