summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielsdeleo <dan@opscode.com>2012-12-10 16:15:49 -0800
committerdanielsdeleo <dan@opscode.com>2012-12-10 16:15:49 -0800
commit197de760a59669790f6d9f28f4442d5efe43cea9 (patch)
tree42b717a4fd81d7850d76de4fa708f8f0645caf22
parent283d076cbfa89956fb3a3bf5d2cdf7f0cddf087f (diff)
downloadchef-CHEF-3557.tar.gz
[CHEF-3557] remove load_current_resource_attrs corpseCHEF-3557
-rw-r--r--lib/chef/provider/directory.rb1
-rw-r--r--lib/chef/provider/file.rb4
-rw-r--r--spec/unit/provider/file_spec.rb15
3 files changed, 13 insertions, 7 deletions
diff --git a/lib/chef/provider/directory.rb b/lib/chef/provider/directory.rb
index 0329aeb1ad..29c9df7fcd 100644
--- a/lib/chef/provider/directory.rb
+++ b/lib/chef/provider/directory.rb
@@ -33,7 +33,6 @@ class Chef
def load_current_resource
@current_resource = Chef::Resource::Directory.new(@new_resource.name)
@current_resource.path(@new_resource.path)
- load_current_resource_attrs
setup_acl
@current_resource
diff --git a/lib/chef/provider/file.rb b/lib/chef/provider/file.rb
index da88b1de7e..6c439bb22a 100644
--- a/lib/chef/provider/file.rb
+++ b/lib/chef/provider/file.rb
@@ -142,10 +142,6 @@ class Chef
@current_resource
end
- # TODO: remove me
- def load_current_resource_attrs
- end
-
def setup_acl
acl_scanner = ScanAccessControl.new(@new_resource, @current_resource)
acl_scanner.set_all!
diff --git a/spec/unit/provider/file_spec.rb b/spec/unit/provider/file_spec.rb
index 9ca98bd55c..d2208d0b16 100644
--- a/spec/unit/provider/file_spec.rb
+++ b/spec/unit/provider/file_spec.rb
@@ -115,8 +115,19 @@ describe Chef::Provider::File do
end
end
- context "load_current_resource_attrs", :windows_only do
- pending "CHEF-3557: Fix implicit resource change collection on Windows"
+ describe "when reporting security metadata on windows" do
+
+ it "records the file owner" do
+ pending
+ end
+
+ it "records rights for each user in the ACL" do
+ pending
+ end
+
+ it "records deny_rights for each user in the ACL" do
+ pending
+ end
end
it "should load a mostly blank current resource if the file specified in new_resource doesn't exist/isn't readable" do