Fix tests

weni-ai · Dec 10, 2024 · 6729037 · 6729037
1 parent bbc0948
commit 6729037
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/core/handlers/ticket_opened_test.go b/core/handlers/ticket_opened_test.go
@@ -32,7 +32,7 @@ func TestTicketOpened(t *testing.T) {
 				"message": "Queued. Thank you."
 			}`),
 		},
-		"https://nyaruka.zendesk.com/api/v2/users/search.json?external_id=b699a406-7e44-49be-9f01-1a82893e8a10": {
+		"https://nyaruka.zendesk.com/api/v2/users/search.json?query=b699a406-7e44-49be-9f01-1a82893e8a10": {
 			httpx.NewMockResponse(200, nil, `{"users": []}`),
 		},
 		"https://nyaruka.zendesk.com/api/v2/users.json": {

diff --git a/services/tickets/zendesk/client_test.go b/services/tickets/zendesk/client_test.go
@@ -313,7 +313,7 @@ func TestSearchUser(t *testing.T) {
 	userUUID := "9a327960-b2ce-4659-bef7-87cbb837a154"
 
 	httpx.SetRequestor(httpx.NewMockRequestor(map[string][]httpx.MockResponse{
-		fmt.Sprintf("https://nyaruka.zendesk.com/api/v2/users/search.json?query=%s", userUUID): {
+		fmt.Sprintf("https://mocked_subdomain.zendesk.com/api/v2/users/search.json?query=%s", userUUID): {
 			httpx.MockConnectionError,
 			httpx.NewMockResponse(400, nil, `{"description": "Something went wrong", "error": "Unknown"}`),
 			httpx.NewMockResponse(200, nil, `{"users": []}`),

diff --git a/services/tickets/zendesk/service_test.go b/services/tickets/zendesk/service_test.go
@@ -41,7 +41,17 @@ func TestOpenAndForward(t *testing.T) {
 	uuids.SetGenerator(uuids.NewSeededGenerator(12345))
 	dates.SetNowSource(dates.NewSequentialNowSource(time.Date(2019, 10, 7, 15, 21, 30, 0, time.UTC)))
 	httpx.SetRequestor(httpx.NewMockRequestor(map[string][]httpx.MockResponse{
-		"https://nyaruka.zendesk.com/api/v2/users/search.json?external_id=5d76d86b-3bb9-4d5a-b822-c9d86f5d8e4f": {
+		"https://nyaruka.zendesk.com/api/v2/users/search.json?query=5d76d86b-3bb9-4d5a-b822-c9d86f5d8e4f": {
+			httpx.NewMockResponse(200, nil, `{"users": [{"id": 35241, "name": "Dummy User"}], "count": 1, "next_page": "https://nyaruka.zendesk.com/api/v2/users.json?page=2"}`),
+			httpx.NewMockResponse(200, nil, `{"users": [{"id": 35241, "name": "Dummy User"}], "count": 1, "next_page": "https://nyaruka.zendesk.com/api/v2/users.json?page=2"}`),
+			httpx.NewMockResponse(200, nil, `{"users": [{"id": 35241, "name": "Dummy User"}], "count": 1, "next_page": "https://nyaruka.zendesk.com/api/v2/users.json?page=2"}`),
+		},
+		"https://nyaruka.zendesk.com/api/v2/users/search.json?query=type:user details:\"5d76d86b-3bb9-4d5a-b822-c9d86f5d8e4f\"": {
+			httpx.NewMockResponse(200, nil, `{"users": [{"id": 35241, "name": "Dummy User"}], "count": 1, "next_page": "https://nyaruka.zendesk.com/api/v2/users.json?page=2"}`),
+			httpx.NewMockResponse(200, nil, `{"users": [{"id": 35241, "name": "Dummy User"}], "count": 1, "next_page": "https://nyaruka.zendesk.com/api/v2/users.json?page=2"}`),
+			httpx.NewMockResponse(200, nil, `{"users": [{"id": 35241, "name": "Dummy User"}], "count": 1, "next_page": "https://nyaruka.zendesk.com/api/v2/users.json?page=2"}`),
+		},
+		"https://nyaruka.zendesk.com/api/v2/users/35241/merge": {
 			httpx.NewMockResponse(200, nil, `{"users": [{"id": 35241, "name": "Dummy User"}], "count": 1, "next_page": "https://nyaruka.zendesk.com/api/v2/users.json?page=2"}`),
 			httpx.NewMockResponse(200, nil, `{"users": [{"id": 35241, "name": "Dummy User"}], "count": 1, "next_page": "https://nyaruka.zendesk.com/api/v2/users.json?page=2"}`),
 			httpx.NewMockResponse(200, nil, `{"users": [{"id": 35241, "name": "Dummy User"}], "count": 1, "next_page": "https://nyaruka.zendesk.com/api/v2/users.json?page=2"}`),
@@ -128,7 +138,7 @@ func TestOpenAndForward(t *testing.T) {
 	assert.Equal(t, "General", ticket.Topic().Name())
 	assert.Equal(t, fieldTicket, ticket.Body())
 	assert.Equal(t, "", ticket.ExternalID())
-	assert.Equal(t, 2, len(logger.Logs))
+	assert.Equal(t, 4, len(logger.Logs))
 	test.AssertSnapshot(t, "open_ticket", logger.Logs[0].Request)
 
 	dbTicket := models.NewTicket(ticket.UUID(), testdata.Org1.ID, testdata.Cathy.ID, testdata.Zendesk.ID, "", testdata.DefaultTopic.ID, "Where are my cookies?", models.NilUserID, map[string]interface{}{

diff --git a/services/tickets/zendesk/testdata/TestOpenAndForward_forward_message.snap b/services/tickets/zendesk/testdata/TestOpenAndForward_forward_message.snap
@@ -6,4 +6,4 @@ Authorization: Bearer ****************
 Content-Type: application/json
 Accept-Encoding: gzip
 
-{"instance_push_id":"1234-abcd","request_id":"sesame:1570461704000000000","external_resources":[{"external_id":"ca5607f0-cba8-4c94-9cd5-c4fbc24aa767","message":"It's urgent","thread_id":"59d74b86-3e2f-4a93-aece-b05d2fdcde0c","created_at":"2019-10-07T15:21:43Z","author":{"external_id":"6393abc0-283d-4c9b-a1b3-641a035c34bf","name":"Cathy"},"allow_channelback":true,"file_urls":["https:///api/v2/file/0123/attachment1.jpg"]}]}
+{"instance_push_id":"1234-abcd","request_id":"sesame:1570461708000000000","external_resources":[{"external_id":"ca5607f0-cba8-4c94-9cd5-c4fbc24aa767","message":"It's urgent","thread_id":"59d74b86-3e2f-4a93-aece-b05d2fdcde0c","created_at":"2019-10-07T15:21:47Z","author":{"external_id":"6393abc0-283d-4c9b-a1b3-641a035c34bf","name":"Cathy"},"allow_channelback":true,"file_urls":["https:///api/v2/file/0123/attachment1.jpg"]}]}
diff --git a/services/tickets/zendesk/testdata/TestOpenAndForward_open.snap b/services/tickets/zendesk/testdata/TestOpenAndForward_open.snap
@@ -1,4 +1,4 @@
-GET /api/v2/users/search.json?external_id=5d76d86b-3bb9-4d5a-b822-c9d86f5d8e4f HTTP/1.1
+GET /api/v2/users/search.json?query=5d76d86b-3bb9-4d5a-b822-c9d86f5d8e4f HTTP/1.1
 Host: nyaruka.zendesk.com
 User-Agent: Go-http-client/1.1
 Authorization: Bearer ****************

diff --git a/services/tickets/zendesk/testdata/TestOpenAndForward_open_ticket.snap b/services/tickets/zendesk/testdata/TestOpenAndForward_open_ticket.snap
@@ -1,4 +1,4 @@
-GET /api/v2/users/search.json?external_id=5d76d86b-3bb9-4d5a-b822-c9d86f5d8e4f HTTP/1.1
+GET /api/v2/users/search.json?query=5d76d86b-3bb9-4d5a-b822-c9d86f5d8e4f HTTP/1.1
 Host: nyaruka.zendesk.com
 User-Agent: Go-http-client/1.1
 Authorization: Bearer ****************