OrganizationsController#delete -> destroy

app/controllers/admin/organizations_controller.rb

@@ -26,7 +26,7 @@ class Admin::OrganizationsController < Admin::AdminController
     end
   end
 
-  def delete
+  def destroy
     deletion_password_confirmation = params[:deletion_password_confirmation]
     if current_user.needs_password_confirmation? && !current_user.validate_old_password(deletion_password_confirmation)
       flash.now[:error] = "Password doesn't match"

config/routes.rb

@@ -79,7 +79,7 @@ CartoDB::Application.routes.draw do
 
     # Organization dashboard page
     get    '(/user/:user_domain)(/u/:user_domain)/organization'                 => 'organizations#show',            as: :organization
-    delete '(/user/:user_domain)(/u/:user_domain)/organization'                 => 'organizations#delete',          as: :organization_delete
+    delete '(/user/:user_domain)(/u/:user_domain)/organization'                 => 'organizations#destroy',          as: :organization_destroy
     get    '(/user/:user_domain)(/u/:user_domain)/organization/settings'        => 'organizations#settings',        as: :organization_settings
     put    '(/user/:user_domain)(/u/:user_domain)/organization/settings'        => 'organizations#settings_update', as: :organization_settings_update
     post '(/user/:user_domain)(/u/:user_domain)/organization/regenerate_api_keys'       => 'organizations#regenerate_all_api_keys', as: :regenerate_organization_users_api_key

spec/requests/admin/organizations_controller_spec.rb

@@ -80,7 +80,7 @@ describe Admin::OrganizationsController do
 
     it 'cannot be accessed by non owner users' do
       login_as(@delete_org_user1, scope: @delete_org_user1.username)
-      delete organization_delete_url(user_domain: @delete_org_user1.username)
+      delete organization_destroy_url(user_domain: @delete_org_user1.username)
       response.status.should eq 404
     end
 
@@ -90,20 +90,20 @@ describe Admin::OrganizationsController do
       end
 
       it 'returns 400 if no password confirmation is provided' do
-        delete organization_delete_url(user_domain: @delete_org_owner.username)
+        delete organization_destroy_url(user_domain: @delete_org_owner.username)
         response.status.should eq 400
         response.body.should include("Password doesn't match")
       end
 
       it 'returns 400 if password confirmation is wrong' do
         payload = { deletion_password_confirmation: @delete_org_owner.password + 'wadus' }
-        delete organization_delete_url(user_domain: @delete_org_owner.username), payload
+        delete organization_destroy_url(user_domain: @delete_org_owner.username), payload
         response.status.should eq 400
       end
 
       it 'deletes organization and redirects if passwords match' do
         payload = { deletion_password_confirmation: @delete_org_owner.password }
-        delete organization_delete_url(user_domain: @delete_org_owner.username), payload
+        delete organization_destroy_url(user_domain: @delete_org_owner.username), payload
         response.status.should eq 302
         Carto::Organization.exists?(@delete_org.id).should be_false
       end