[e2e] add cleanup

Author: capcom6

test/e2e/webhooks_test.go

@@ -205,6 +205,13 @@ func TestWebhooks_Post(t *testing.T) {
 					t.Fatal(err)
 				}
 
+				t.Cleanup(func() {
+					_, err := authorizedClient.R().Delete("webhooks/" + result.ID)
+					if err != nil {
+						t.Fatal(err)
+					}
+				})
+
 				// Verify response structure
 				if result.ID == "" {
 					t.Error("webhook ID is empty")
@@ -241,6 +248,13 @@ func TestWebhooks_Post(t *testing.T) {
 					t.Fatal(err)
 				}
 
+				t.Cleanup(func() {
+					_, err := authorizedClient.R().Delete("webhooks/" + result.ID)
+					if err != nil {
+						t.Fatal(err)
+					}
+				})
+
 				// Verify response structure
 				if result.ID == "" {
 					t.Error("webhook ID is empty")
@@ -279,6 +293,13 @@ func TestWebhooks_Post(t *testing.T) {
 					t.Fatal(err)
 				}
 
+				t.Cleanup(func() {
+					_, err := authorizedClient.R().Delete("webhooks/" + result.ID)
+					if err != nil {
+						t.Fatal(err)
+					}
+				})
+
 				// Verify response structure
 				if result.Event != "sms:data-received" {
 					t.Errorf("expected event 'sms:data-received', got '%s'", result.Event)
@@ -481,18 +502,17 @@ func TestWebhooks_Delete(t *testing.T) {
 
 	cases := []struct {
 		name               string
-		setup              func()
+		setup              func() string
 		expectedStatusCode int
-		request            func() *resty.Request
+		request            func(id string) *resty.Request
 		validate           func(t *testing.T, response *resty.Response)
 	}{
 		{
 			name: "Remove webhook by ID",
-			setup: func() {
-				// Create a webhook to delete
+			setup: func() string {
+				// Create a webhook to delete (server will generate ID)
 				resp, err := authorizedClient.R().
 					SetBody(webhook{
-						ID:    "delete-test",
 						URL:   "https://example.com/delete-test",
 						Event: "sms:failed",
 					}).Post("webhooks")
@@ -505,15 +525,11 @@ func TestWebhooks_Delete(t *testing.T) {
 					t.Fatal(err)
 				}
 
-				// Store webhook ID for deletion test
-				t.Cleanup(func() {
-					// Clean up any remaining webhooks
-					authorizedClient.R().Delete("webhooks/" + created.ID)
-				})
+				return created.ID
 			},
 			expectedStatusCode: 204,
-			request: func() *resty.Request {
-				return authorizedClient.R().SetPathParam("id", "delete-test")
+			request: func(id string) *resty.Request {
+				return authorizedClient.R().SetPathParam("id", id)
 			},
 			validate: func(t *testing.T, response *resty.Response) {
 				if len(response.Body()) != 0 {
@@ -523,11 +539,12 @@ func TestWebhooks_Delete(t *testing.T) {
 		},
 		{
 			name: "Remove non-existent webhook",
-			setup: func() {
+			setup: func() string {
 				// No setup needed
+				return ""
 			},
 			expectedStatusCode: 204,
-			request: func() *resty.Request {
+			request: func(id string) *resty.Request {
 				return authorizedClient.R().SetPathParam("id", "non-existent-id")
 			},
 			validate: func(t *testing.T, response *resty.Response) {
@@ -538,11 +555,12 @@ func TestWebhooks_Delete(t *testing.T) {
 		},
 		{
 			name: "Missing authentication",
-			setup: func() {
+			setup: func() string {
 				// No setup needed
+				return ""
 			},
 			expectedStatusCode: 401,
-			request: func() *resty.Request {
+			request: func(id string) *resty.Request {
 				return publicUserClient.R().SetPathParam("id", "test-id")
 			},
 			validate: func(t *testing.T, response *resty.Response) {
@@ -558,11 +576,12 @@ func TestWebhooks_Delete(t *testing.T) {
 		},
 		{
 			name: "Invalid credentials",
-			setup: func() {
+			setup: func() string {
 				// No setup needed
+				return ""
 			},
 			expectedStatusCode: 401,
-			request: func() *resty.Request {
+			request: func(id string) *resty.Request {
 				return publicUserClient.R().SetBasicAuth("invalid", "credentials").SetPathParam("id", "test-id")
 			},
 			validate: func(t *testing.T, response *resty.Response) {
@@ -580,9 +599,15 @@ func TestWebhooks_Delete(t *testing.T) {
 
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-			c.setup()
+			webhookID := c.setup()
+			// Clean up the webhook if one was created
+			if webhookID != "" {
+				t.Cleanup(func() {
+					authorizedClient.R().Delete("webhooks/" + webhookID)
+				})
+			}
 
-			res, err := c.request().Delete("webhooks/{id}")
+			res, err := c.request(webhookID).Delete("webhooks/{id}")
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -594,6 +619,7 @@ func TestWebhooks_Delete(t *testing.T) {
 			if c.validate != nil {
 				c.validate(t, res)
 			}
+
 		})
 	}
 }