From c6f1013266907a49efd23c2c5959668d09e60307 Mon Sep 17 00:00:00 2001
From: Ryan Cragun <me@ryan.ec>
Date: Wed, 17 Sep 2014 10:40:29 -0700
Subject: Populate the actors when creating groups

---
 lib/chef/chef_fs/data_handler/group_data_handler.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/chef/chef_fs/data_handler/group_data_handler.rb b/lib/chef/chef_fs/data_handler/group_data_handler.rb
index 619822fe70..19bd1b8712 100644
--- a/lib/chef/chef_fs/data_handler/group_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/group_data_handler.rb
@@ -36,6 +36,10 @@ class Chef
           result
         end
 
+        def normalize_for_post(group, entry)
+          normalize_for_put(group, entry)
+        end
+
         def preserve_key(key)
           return key == 'name'
         end
-- 
cgit v1.2.1


From e7d1eceb754c10216957cb7feeb223828560b665 Mon Sep 17 00:00:00 2001
From: Ryan Cragun <me@ryan.ec>
Date: Mon, 3 Nov 2014 17:46:32 -0800
Subject: Add unit test for group normalization in ChefFS

---
 .../chef_fs/data_handler/group_data_handler.rb     |  2 +-
 .../chef_fs/data_handler/group_handler_spec.rb     | 63 ++++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 spec/unit/chef_fs/data_handler/group_handler_spec.rb

diff --git a/lib/chef/chef_fs/data_handler/group_data_handler.rb b/lib/chef/chef_fs/data_handler/group_data_handler.rb
index 19bd1b8712..1a36c66eb8 100644
--- a/lib/chef/chef_fs/data_handler/group_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/group_data_handler.rb
@@ -40,7 +40,7 @@ class Chef
           normalize_for_put(group, entry)
         end
 
-        def preserve_key(key)
+        def preserve_key?(key)
           return key == 'name'
         end
 
diff --git a/spec/unit/chef_fs/data_handler/group_handler_spec.rb b/spec/unit/chef_fs/data_handler/group_handler_spec.rb
new file mode 100644
index 0000000000..5f14646602
--- /dev/null
+++ b/spec/unit/chef_fs/data_handler/group_handler_spec.rb
@@ -0,0 +1,63 @@
+#
+# Author:: Ryan Cragun (<ryan@getchef.com>)
+# Copyright:: Copyright (c) 2014 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'
+require 'lib/chef/chef_fs/data_handler/group_data_handler'
+
+class TestEntry < Mash
+  attr_accessor :name, :org
+
+  def initialize(name, org)
+    @name = name
+    @org = org
+  end
+end
+
+describe Chef::ChefFS::DataHandler::GroupDataHandler do
+  describe '#normalize_for_post' do
+    let(:entry) do
+      TestEntry.new('workers.json', 'hive')
+    end
+
+    let(:group) do
+      { 'name' => 'worker_bees',
+        'clients' => %w(honey sting),
+        'users' => %w(fizz buzz),
+        'actors' => %w(honey)
+      }
+    end
+
+    let(:normalized) do
+      { 'actors' =>
+          { 'users' => %w(fizz buzz),
+            'clients'=> %w(honey sting),
+            'groups'=> []
+          },
+        'groupname' => 'workers',
+        'name' => 'worker_bees',
+        'orgname' => 'hive'
+      }
+    end
+
+    let(:handler) { described_class.new }
+
+    it 'normalizes the users, clients and groups into actors' do
+      expect(handler.normalize_for_post(group, entry)).to eq(normalized)
+    end
+  end
+end
-- 
cgit v1.2.1