summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-02-01 13:24:49 -0800
committerJohn Keiser <john@johnkeiser.com>2016-02-01 13:56:30 -0800
commit45bac377260c6cfe7339efa28f5aa1cee4e6bb84 (patch)
treedea1846815173d704ee4b2ffa70b676cbb3a3b08
parent85bc209cf1e20bc49fe436b60529b4e3114f490e (diff)
downloadchef-45bac377260c6cfe7339efa28f5aa1cee4e6bb84.tar.gz
Add missing acl_entry backwards compatibility "require"
-rw-r--r--lib-backcompat/chef/chef_fs/file_system/acl_entry.rb5
-rw-r--r--spec/unit/lib_backcompat_spec.rb34
2 files changed, 39 insertions, 0 deletions
diff --git a/lib-backcompat/chef/chef_fs/file_system/acl_entry.rb b/lib-backcompat/chef/chef_fs/file_system/acl_entry.rb
new file mode 100644
index 0000000000..f28b9f86e3
--- /dev/null
+++ b/lib-backcompat/chef/chef_fs/file_system/acl_entry.rb
@@ -0,0 +1,5 @@
+require "chef/chef_fs/file_system/chef_server/acl_entry"
+
+module Chef::ChefFS::FileSystem
+ AclEntry = ChefServer::AclEntry
+end
diff --git a/spec/unit/lib_backcompat_spec.rb b/spec/unit/lib_backcompat_spec.rb
new file mode 100644
index 0000000000..67f42089e2
--- /dev/null
+++ b/spec/unit/lib_backcompat_spec.rb
@@ -0,0 +1,34 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+
+describe "lib-backcompat" do
+ it "require 'chef/chef_fs/file_system/chef_server_root_dir' yields the proper class" do
+ require "chef/chef_fs/file_system/chef_server_root_dir"
+ expect(Chef::ChefFS::FileSystem::ChefServerRootDir).to eq(Chef::ChefFS::FileSystem::ChefServer::ChefServerRootDir)
+ end
+ it "require 'chef/chef_fs/file_system/chef_repository_file_system_root_dir' yields the proper class" do
+ require "chef/chef_fs/file_system/chef_repository_file_system_root_dir"
+ expect(Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir).to eq(Chef::ChefFS::FileSystem::Repository::ChefRepositoryFileSystemRootDir)
+ end
+ it "require 'chef/chef_fs/file_system/acl_entry' yields the proper class" do
+ require "chef/chef_fs/file_system/acl_entry"
+ expect(Chef::ChefFS::FileSystem::AclEntry).to eq(Chef::ChefFS::FileSystem::ChefServer::AclEntry)
+ end
+end