Merge pull request #1214 from wakatime/develop

Release v1.127.0

Author: alanhamlett

cmd/handler/handler_test.go

@@ -63,7 +63,7 @@ func TestHandlerNew(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	assert.Len(t, res, 1)
+	require.Len(t, res, 1)
 	assert.Equal(t, res[0].Heartbeat.APIKey, "00000000-0000-4000-8000-000000000002")
 }
 

cmd/handler/option_test.go

@@ -24,6 +24,18 @@ func TestWithFormatting(t *testing.T) {
 	assert.Len(t, res, 0)
 }
 
+func TestWithCategoryDetection(t *testing.T) {
+	opt := handler.WithCategoryDetection()
+
+	chain := heartbeat.NewHandle(noopMock{})
+	hdl := opt(params.Params{})(chain)
+
+	res, err := hdl(context.Background(), nil)
+	require.NoError(t, err)
+
+	assert.Len(t, res, 0)
+}
+
 func TestWithEntityModifier(t *testing.T) {
 	opt := handler.WithEntityModifier()
 

cmd/heartbeat/heartbeat.go

@@ -211,17 +211,19 @@ func buildHeartbeats(ctx context.Context, params params.Params) []heartbeat.Hear
 	var heartbeats = make([]heartbeat.Heartbeat, 0, 1+len(params.Heartbeat.ExtraHeartbeats))
 
 	heartbeats = append(heartbeats, heartbeat.New(
+		params.Heartbeat.AIAdditions,
+		params.Heartbeat.AIDeletions,
 		params.Heartbeat.Project.BranchAlternate,
 		params.Heartbeat.Category.String(),
 		params.Heartbeat.CursorPosition,
 		params.Heartbeat.Entity,
 		params.Heartbeat.EntityType,
+		params.Heartbeat.HumanAdditions,
+		params.Heartbeat.HumanDeletions,
 		params.Heartbeat.IsUnsavedEntity,
 		params.Heartbeat.IsWrite,
 		params.Heartbeat.Language,
 		params.Heartbeat.LanguageAlternate,
-		params.Heartbeat.LineAdditions,
-		params.Heartbeat.LineDeletions,
 		params.Heartbeat.LineNumber,
 		params.Heartbeat.LinesInFile,
 		params.Heartbeat.LocalFile,

cmd/heartbeat/testdata/api_heartbeats_response.json

@@ -3,24 +3,7 @@
         [
             {
                 "data": {
-                    "branch": "heartbeat",
-                    "category": "coding",
-                    "created_at": "2020-04-14T21:27:15Z",
-                    "cursorpos": 12,
-                    "dependencies": ["dep1", "dep2"],
-                    "entity": "/tmp/main.go",
-                    "id": "845a922e-9e65-4775-bd68-bb3196d2e06a",
-                    "is_write": true,
-                    "language": "Go",
-                    "lineno": 42,
-                    "lines": 100,
-                    "machine_name_id": null,
-                    "project": "wakatime-cli",
-                    "type": "file",
-                    "time": 1585598059.0,
-                    "user_agent_id": null,
-                    "user_agent": "wakatime/13.0.6",
-                    "user_id": "9c4a41c0-eb11-4cf5-84b8-d5b7f5e91bea"
+                    "id": "H3C4D5E6-F7G8-9012-3456-789ABCDEF123"
                 }
             },
             201