summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielsdeleo <dan@opscode.com>2012-12-10 16:15:49 -0800
committerdanielsdeleo <dan@opscode.com>2013-01-03 16:26:34 -0800
commit565a608fdaf72650e24df793389dca6ce9fe0098 (patch)
tree6caad273307628ed855deb6cf1495cde654931ef
parent8be5dcbfa21315ba97204e498d02e42cf2ccde2e (diff)
downloadchef-565a608fdaf72650e24df793389dca6ce9fe0098.tar.gz
[CHEF-3557] remove load_current_resource_attrs corpse
-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 37dc03c9fb..73940381da 100644
--- a/lib/chef/provider/directory.rb
+++ b/lib/chef/provider/directory.rb
@@ -36,7 +36,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 14da43599a..14081e38c3 100644
--- a/lib/chef/provider/file.rb
+++ b/lib/chef/provider/file.rb
@@ -143,10 +143,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 3d41d326d3..f3aa093367 100644
--- a/spec/unit/provider/file_spec.rb
+++ b/spec/unit/provider/file_spec.rb
@@ -117,8 +117,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