coder
diff --git a/‎coderd/apidoc/docs.go
Lines changed: 16 additions & 0 deletions b/‎coderd/apidoc/docs.go
Lines changed: 16 additions & 0 deletions
diff --git a/‎coderd/apidoc/swagger.json
Lines changed: 16 additions & 0 deletions b/‎coderd/apidoc/swagger.json
Lines changed: 16 additions & 0 deletions
diff --git a/‎coderd/organizations.go
Lines changed: 1 addition & 1 deletion b/‎coderd/organizations.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/organizations_test.go
Lines changed: 75 additions & 1 deletion b/‎coderd/organizations_test.go
Lines changed: 75 additions & 1 deletion
diff --git a/‎docs/api/organizations.md
Lines changed: 10 additions & 3 deletions b/‎docs/api/organizations.md
Lines changed: 10 additions & 3 deletions
@@ -183,7 +183,7 @@ func (api *API) patchOrganization(rw http.ResponseWriter, r *http.Request) {
 // @Produce json
 // @Tags Organizations
 // @Param organization path string true "Organization ID or name"
-// @Success 200
+// @Success 200 {object} codersdk.Response
 // @Router /organizations/{organization} [delete]
 func (api *API) deleteOrganization(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
@@ -187,7 +187,27 @@ func TestPatchOrganizationsByUser(t *testing.T) {
 		require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
 	})
 
-	t.Run("Update", func(t *testing.T) {
+	t.Run("UpdateById", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		_ = coderdtest.CreateFirstUser(t, client)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
+			Name: "new",
+		})
+		require.NoError(t, err)
+
+		o, err = client.UpdateOrganization(ctx, o.ID.String(), codersdk.UpdateOrganizationRequest{
+			Name: "new-new",
+		})
+		require.NoError(t, err)
+		require.Equal(t, "new-new", o.Name)
+	})
+
+	t.Run("UpdateByName", func(t *testing.T) {
 		t.Parallel()
 		client := coderdtest.New(t, nil)
 		_ = coderdtest.CreateFirstUser(t, client)
@@ -207,3 +227,57 @@ func TestPatchOrganizationsByUser(t *testing.T) {
 		require.Equal(t, "new-new", o.Name)
 	})
 }
+
+func TestDeleteOrganizationsByUser(t *testing.T) {
+	t.Parallel()
+	t.Run("Default", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		user := coderdtest.CreateFirstUser(t, client)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		o, err := client.Organization(ctx, user.OrganizationID)
+		require.NoError(t, err)
+
+		err = client.DeleteOrganization(ctx, o.ID.String())
+		var apiErr *codersdk.Error
+		require.ErrorAs(t, err, &apiErr)
+		require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
+	})
+
+	t.Run("DeleteById", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		_ = coderdtest.CreateFirstUser(t, client)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
+			Name: "doomed",
+		})
+		require.NoError(t, err)
+
+		err = client.DeleteOrganization(ctx, o.ID.String())
+		require.NoError(t, err)
+	})
+
+	t.Run("DeleteByName", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		_ = coderdtest.CreateFirstUser(t, client)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
+			Name: "doomed",
+		})
+		require.NoError(t, err)
+
+		err = client.DeleteOrganization(ctx, o.Name)
+		require.NoError(t, err)
+	})
+}