spec/support/chef_server.rb in berkshelf-4.0.1 vs spec/support/chef_server.rb in berkshelf-4.1.0

@@ -60,12 +60,12 @@
     def chef_cookbook(name, hash = {})
       chef_server.load_data({ 'cookbooks' => { name => hash }})
     end
 
     def chef_cookbooks
-      chef_server.data_store.list(['cookbooks']).inject({}) do |hash, name|
-        hash[name] = chef_server.data_store.list(['cookbooks', name])
+      chef_server.data_store.list(['organizations', 'chef', 'cookbooks']).inject({}) do |hash, name|
+        hash[name] = chef_server.data_store.list(['organizations', 'chef', 'cookbooks', name])
         hash
       end
     end
 
     def chef_data_bag(name, hash = {})
@@ -75,10 +75,10 @@
     def chef_environment(name, hash = {})
       load_data(:environments, name, hash)
     end
 
     def chef_environment_locks(name)
-      JSON.parse(chef_server.data_store.get(['environments', name]))['cookbook_versions']
+      JSON.parse(chef_server.data_store.get(['organizations', 'chef', 'environments', name]))['cookbook_versions']
     rescue ChefZero::DataStore::DataNotFoundError
       {}
     end
 
     def chef_node(name, hash = {})