diff options
| author | danielsdeleo <dan@opscode.com> | 2013-06-25 22:23:27 -0700 |
|---|---|---|
| committer | danielsdeleo <dan@opscode.com> | 2013-06-26 10:47:47 -0700 |
| commit | 02cce01e2d351a5974fc10ee755ddf9c9fd36a5d (patch) | |
| tree | dd54e26f75935a59d9a7b2b8121383a3f929a3c5 /spec/support/shared/functional | |
| parent | 7b4a67335fa6145d7d4675e1a17549ef7c1ce4d7 (diff) | |
| download | chef-02cce01e2d351a5974fc10ee755ddf9c9fd36a5d.tar.gz | |
Fix spec file loading annoyances
- Don't load all knife subcommands. Fixes error running tests on 1.8
when you have 1.9-only plugins installed.
- Adjust spec file loading to use paths relative to spec/
Diffstat (limited to 'spec/support/shared/functional')
| -rw-r--r-- | spec/support/shared/functional/securable_resource_with_reporting.rb | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/spec/support/shared/functional/securable_resource_with_reporting.rb b/spec/support/shared/functional/securable_resource_with_reporting.rb index b87993f3fc..2bfc257731 100644 --- a/spec/support/shared/functional/securable_resource_with_reporting.rb +++ b/spec/support/shared/functional/securable_resource_with_reporting.rb @@ -1,4 +1,25 @@ +ALL_EXPANDED_PERMISSIONS = ["generic read", + "generic write", + "generic execute", + "generic all", + "delete", + "read permissions", + "change permissions", + "take ownership", + "synchronize", + "access system security", + "read data / list directory", + "write data / add file", + "append data / add subdirectory", + "read extended attributes", + "write extended attributes", + "execute / traverse", + "delete child", + "read attributes", + "write attributes"] + + shared_examples_for "a securable resource with reporting" do include_context "diff disabled" @@ -240,26 +261,6 @@ shared_examples_for "a securable resource with reporting" do pending "windows reporting not yet fully supported" end - ALL_EXPANDED_PERMISSIONS = ["generic read", - "generic write", - "generic execute", - "generic all", - "delete", - "read permissions", - "change permissions", - "take ownership", - "synchronize", - "access system security", - "read data / list directory", - "write data / add file", - "append data / add subdirectory", - "read extended attributes", - "write extended attributes", - "execute / traverse", - "delete child", - "read attributes", - "write attributes"] - context "when the target file doesn't exist" do |