MethodNotAllowed when modifying _default env

Author: sdelano

chef-server-api/app/controllers/environments.rb

@@ -60,7 +60,7 @@ def create
 
   # PUT /environments/:id
   def update
-    raise Forbidden if params[:id] == "_default"
+    raise MethodNotAllowed if params[:id] == "_default"
     begin
       env = Chef::Environment.cdb_load(params[:id])
     rescue Chef::Exceptions::CouchDBNotFound
@@ -76,7 +76,7 @@ def update
 
   # DELETE /environments/:id
   def destroy
-    raise Forbidden if params[:id] == "_default"
+    raise MethodNotAllowed if params[:id] == "_default"
     begin
       env = Chef::Environment.cdb_load(params[:id])
     rescue Chef::Exceptions::CouchDBNotFound

features/api/environments/delete_environment_api.feature

@@ -30,9 +30,9 @@ Feature: Delete environments via the REST API
   Scenario Outline: Delete the '_default' environment
     Given I am <user_type>
      When I 'DELETE' the path '/environments/_default'
-     Then I should get a '403 "Forbidden"' exception
+     Then I should get a '<exception_type>' exception
 
   Examples:
-    | user_type        |
-    | an administrator |
-    | a non-admin      |
+    | user_type        | exception_type           |
+    | an administrator | 405 "Method Not Allowed" |
+    | a non-admin      | 403 "Forbidden"          |

features/api/environments/update_environment_api.feature

@@ -43,9 +43,9 @@ Feature: Update an environment via the REST API
     Given I am <user_type>
       And an 'environment' named 'cucumber'
      When I 'PUT' the 'environment' to the path '/environments/_default'
-     Then I should get a '403 "Forbidden"' exception
+     Then I should get a '<exception_type>' exception
 
   Examples:
-    | user_type        |
-    | an administrator |
-    | a non-admin      |
+    | user_type        | exception_type           |
+    | an administrator | 405 "Method Not Allowed" |
+    | a non-admin      | 403 "Forbidden"          |