diff options
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/platform_helpers.rb | 6 | ||||
-rw-r--r-- | spec/support/platforms/win32/spec_service.rb | 2 | ||||
-rw-r--r-- | spec/support/shared/functional/directory_resource.rb | 2 | ||||
-rw-r--r-- | spec/support/shared/functional/execute_resource.rb | 2 | ||||
-rw-r--r-- | spec/support/shared/functional/file_resource.rb | 4 | ||||
-rw-r--r-- | spec/support/shared/functional/win32_service.rb | 2 | ||||
-rw-r--r-- | spec/support/shared/functional/windows_script.rb | 6 |
7 files changed, 12 insertions, 12 deletions
diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb index 05839d40ea..8d21c5cbd2 100644 --- a/spec/support/platform_helpers.rb +++ b/spec/support/platform_helpers.rb @@ -105,7 +105,7 @@ def mac_osx_1014? end def mac_osx? - if File.exists? "/usr/bin/sw_vers" + if File.exist? "/usr/bin/sw_vers" result = ShellHelpers.shell_out("/usr/bin/sw_vers") result.stdout.each_line do |line| if /^ProductName:\sMac OS X.*$/.match?(line) @@ -216,8 +216,8 @@ def selinux_enabled? end def suse? - ::File.exists?("/etc/SuSE-release") || - ( ::File.exists?("/etc/os-release") && /sles|suse/.match?(File.read("/etc/os-release")) ) + ::File.exist?("/etc/SuSE-release") || + ( ::File.exist?("/etc/os-release") && /sles|suse/.match?(File.read("/etc/os-release")) ) end def root? diff --git a/spec/support/platforms/win32/spec_service.rb b/spec/support/platforms/win32/spec_service.rb index 34bb1fe3db..27f71a8bf0 100644 --- a/spec/support/platforms/win32/spec_service.rb +++ b/spec/support/platforms/win32/spec_service.rb @@ -26,7 +26,7 @@ if RUBY_PLATFORM.match?(/mswin|mingw|windows/) def service_main(*startup_parameters) while running? - unless File.exists?(@test_service_file) + unless File.exist?(@test_service_file) File.open(@test_service_file, "wb") do |f| f.write("This file is created by SpecService") end diff --git a/spec/support/shared/functional/directory_resource.rb b/spec/support/shared/functional/directory_resource.rb index 62055ca07d..cd05280aa8 100644 --- a/spec/support/shared/functional/directory_resource.rb +++ b/spec/support/shared/functional/directory_resource.rb @@ -173,6 +173,6 @@ shared_context Chef::Resource::Directory do end after(:each) do - FileUtils.rm_r(path) if File.exists?(path) + FileUtils.rm_r(path) if File.exist?(path) end end diff --git a/spec/support/shared/functional/execute_resource.rb b/spec/support/shared/functional/execute_resource.rb index 5e0c9e4e28..9d1c29dfac 100644 --- a/spec/support/shared/functional/execute_resource.rb +++ b/spec/support/shared/functional/execute_resource.rb @@ -62,7 +62,7 @@ shared_context "a command that can be executed as an alternate user" do end after do - File.delete(script_output_path) if File.exists?(script_output_path) + File.delete(script_output_path) if File.exist?(script_output_path) Dir.rmdir(script_output_dir) if Dir.exist?(script_output_dir) end end diff --git a/spec/support/shared/functional/file_resource.rb b/spec/support/shared/functional/file_resource.rb index 77e823a682..1385d3dc30 100644 --- a/spec/support/shared/functional/file_resource.rb +++ b/spec/support/shared/functional/file_resource.rb @@ -1037,8 +1037,8 @@ shared_context Chef::Resource::File do end after(:each) do - FileUtils.rm_r(path) if File.exists?(path) - FileUtils.rm_r(CHEF_SPEC_BACKUP_PATH) if File.exists?(CHEF_SPEC_BACKUP_PATH) + FileUtils.rm_r(path) if File.exist?(path) + FileUtils.rm_r(CHEF_SPEC_BACKUP_PATH) if File.exist?(CHEF_SPEC_BACKUP_PATH) end after do diff --git a/spec/support/shared/functional/win32_service.rb b/spec/support/shared/functional/win32_service.rb index 2d14c6cf86..dfd66f74ad 100644 --- a/spec/support/shared/functional/win32_service.rb +++ b/spec/support/shared/functional/win32_service.rb @@ -30,7 +30,7 @@ shared_context "using Win32::Service" do end # Delete the test_service_file if it exists - if File.exists?(test_service_file) + if File.exist?(test_service_file) File.delete(test_service_file) end end diff --git a/spec/support/shared/functional/windows_script.rb b/spec/support/shared/functional/windows_script.rb index 3ccb7b6e37..151ad2387c 100644 --- a/spec/support/shared/functional/windows_script.rb +++ b/spec/support/shared/functional/windows_script.rb @@ -39,11 +39,11 @@ shared_context Chef::Resource::WindowsScript do end before(:each) do - File.delete(script_output_path) if File.exists?(script_output_path) + File.delete(script_output_path) if File.exist?(script_output_path) end after(:each) do - File.delete(script_output_path) if File.exists?(script_output_path) + File.delete(script_output_path) if File.exist?(script_output_path) end shared_examples_for "a script resource with architecture attribute" do @@ -138,7 +138,7 @@ shared_context Chef::Resource::WindowsScript do after do script_file.close! if script_file - ::File.delete(script_file.to_path) if script_file && ::File.exists?(script_file.to_path) + ::File.delete(script_file.to_path) if script_file && ::File.exist?(script_file.to_path) end include_context "alternate user identity" |