diff options
author | Markus Roberts <Markus@reality.com> | 2010-07-09 18:01:33 -0700 |
---|---|---|
committer | Markus Roberts <Markus@reality.com> | 2010-07-09 18:01:33 -0700 |
commit | 77f8599f55be12bf5c7d69ac8f439d1fd756eafc (patch) | |
tree | e8db2af5836d6fb4e3061531d570ffd24a087373 /spec/unit | |
parent | 3fbc1d57f07598de225ac805ff000733480c9ff8 (diff) | |
download | puppet-77f8599f55be12bf5c7d69ac8f439d1fd756eafc.tar.gz puppet-77f8599f55be12bf5c7d69ac8f439d1fd756eafc.tar.xz puppet-77f8599f55be12bf5c7d69ac8f439d1fd756eafc.zip |
Code smell: Win32 --> MS_windows
* Replaced 12 occurances of Win32 with Microsoft Windows
3 Examples:
The code:
# and all .rb files in lib/. This is disabled by default on Win32.
becomes:
# and all .rb files in lib/. This is disabled by default on Microsoft Windows.
The code:
# We can use Win32 functions
becomes:
# We can use Microsoft Windows functions
The code:
desc "Uses Win32 functionality to manage file's users and rights."
becomes:
desc "Uses Microsoft Windows functionality to manage file's users and rights."
* Replaced 10 occurances of :win32 with :microsoft_windows
3 Examples:
The code:
Puppet.features.add(:win32, :libs => ["sys/admin", "win32/process", "win32/dir"])
becomes:
Puppet.features.add(:microsoft_windows, :libs => ["sys/admin", "win32/process", "win32/dir"])
The code:
Puppet::Type.type(:file).provide :win32 do
becomes:
Puppet::Type.type(:file).provide :microsoft_windows do
The code:
confine :feature => :win32
becomes:
confine :feature => :microsoft_windows
* Replaced 13 occurances of win32\? with microsoft_windows?
3 Examples:
The code:
signals.update({:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }) unless Puppet.features.win32?
becomes:
signals.update({:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }) unless Puppet.features.microsoft_windows?
The code:
raise Puppet::Error,"Cannot determine basic system flavour" unless Puppet.features.posix? or Puppet.features.win32?
becomes:
raise Puppet::Error,"Cannot determine basic system flavour" unless Puppet.features.posix? or Puppet.features.microsoft_windows?
The code:
require 'sys/admin' if Puppet.features.win32?
becomes:
require 'sys/admin' if Puppet.features.microsoft_windows?
Diffstat (limited to 'spec/unit')
-rwxr-xr-x | spec/unit/type/file_spec.rb | 28 | ||||
-rwxr-xr-x | spec/unit/util/settings/file_setting_spec.rb | 2 |
2 files changed, 15 insertions, 15 deletions
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" |