Get organization endpoint passing oc-chef-pedant

3 files changed, 9 insertions, 3 deletions

diff --git a/lib/chef_zero/endpoints/organization_endpoint.rb b/lib/chef_zero/endpoints/organization_endpoint.rb
index 554982f..b33b105 100644
--- a/lib/chef_zero/endpoints/organization_endpoint.rb
+++ b/lib/chef_zero/endpoints/organization_endpoint.rb
@@ -17,8 +17,12 @@ module ChefZero
           org[key] = value
         end
         org = JSON.pretty_generate(org)
+        if new_org['name'] != request.rest_path[-1]
+          # This is a rename
+          return error(400, "Cannot rename org #{request.rest_path[-1]} to #{new_org['name']}: rename not supported for orgs")
+        end
         set_data(request, request.rest_path + [ 'org' ], org)
-        already_json_response(200, populate_defaults(request, org))
+        json_response(200, "uri" => "#{build_uri(request.base_uri, request.rest_path)}")
       end
 
       def delete(request)
diff --git a/lib/chef_zero/endpoints/organizations_endpoint.rb b/lib/chef_zero/endpoints/organizations_endpoint.rb
index 1609a6b..835faf9 100644
--- a/lib/chef_zero/endpoints/organizations_endpoint.rb
+++ b/lib/chef_zero/endpoints/organizations_endpoint.rb
@@ -25,7 +25,7 @@ module ChefZero
           create_data_dir(request, request.rest_path, name, :requestor => request.requestor)
 
           org = {
-            "guid" => UUIDTools::UUID.random_create,
+            "guid" => UUIDTools::UUID.random_create.to_s.gsub('-', ''),
             "assigned_at" => Time.now.to_s
           }
           org_path = request.rest_path + [ name ]
diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb
index c0cc01e..562bf6a 100644
--- a/spec/run_oc_pedant.rb
+++ b/spec/run_oc_pedant.rb
@@ -38,7 +38,9 @@ begin
     '--skip-authentication',
     '--skip-authorization',
     '--skip-omnibus',
-    '--skip-usags'
+    '--skip-usags',
+    '--skip-internal_orgs',
+    '--skip-rename_org'
   ])
 
   result = RSpec::Core::Runner.run(Pedant.config.rspec_args)