Fix /acls/data_bags local mode path

3 files changed, 7 insertions, 3 deletions

diff --git a/Gemfile b/Gemfile
index e20618825c..2c37e6c7d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,8 +51,6 @@ group(:travis) do
   gem "bundler-audit", git: "https://github.com/rubysec/bundler-audit.git", ref: "4e32fca"
 end
 
-gem "chef-zero", github: "chef/chef-zero", branch: "cd/run-acl-specs"
-
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
 
 # If you want to load debugging tools into the bundle exec sandbox,
diff --git a/lib/chef/chef_fs/chef_fs_data_store.rb b/lib/chef/chef_fs/chef_fs_data_store.rb
index 729b01fdcc..a02fe605f4 100644
--- a/lib/chef/chef_fs/chef_fs_data_store.rb
+++ b/lib/chef/chef_fs/chef_fs_data_store.rb
@@ -696,6 +696,12 @@ class Chef
           end
 
         elsif path[0] == "acls"
+          # /acls/data -> /acls/data_bags
+          if path[1] == "data"
+            path = path.dup
+            path[1] = "data_bags"
+          end
+
           # /acls/containers|nodes|.../x.json
           # /acls/organization.json
           if path.length == 3 || path == [ "acls", "organization" ]
diff --git a/spec/integration/knife/chef_fs_data_store_spec.rb b/spec/integration/knife/chef_fs_data_store_spec.rb
index b836ebac82..d6338cc3e3 100644
--- a/spec/integration/knife/chef_fs_data_store_spec.rb
+++ b/spec/integration/knife/chef_fs_data_store_spec.rb
@@ -53,7 +53,7 @@ describe "ChefFSDataStore tests", :workstation do
       end
 
       context "GET /TYPE" do
-        it "knife list -z -R returns everything", :focus do
+        it "knife list -z -R returns everything" do
           knife("list -z -Rfp /").should_succeed <<EOM
 /acls/
 /acls/clients/