Merge pull request #2450 from opscode/sersut/port-chef-2073

Merge pull request #2073 from opscode/ryan/group_post-master

2 files changed, 67 insertions, 0 deletions

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 4d1b10f321..1a36c66eb8 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
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