From c55469065267f3fec8b7b456b4a4942a8aa43061 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Mon, 21 Oct 2019 20:42:12 +0100 Subject: [PATCH 1/2] Update heatmap fixtures to restore tests --- integrations/api_user_heatmap_test.go | 2 +- models/fixtures/action.yml | 2 +- models/user_heatmap_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integrations/api_user_heatmap_test.go b/integrations/api_user_heatmap_test.go index 5245bb0a265e7..2e2636ce94d2d 100644 --- a/integrations/api_user_heatmap_test.go +++ b/integrations/api_user_heatmap_test.go @@ -26,7 +26,7 @@ func TestUserHeatmap(t *testing.T) { var heatmap []*models.UserHeatmapData DecodeJSON(t, resp, &heatmap) var dummyheatmap []*models.UserHeatmapData - dummyheatmap = append(dummyheatmap, &models.UserHeatmapData{Timestamp: 1540080000, Contributions: 1}) + dummyheatmap = append(dummyheatmap, &models.UserHeatmapData{Timestamp: 1571616000, Contributions: 1}) assert.Equal(t, dummyheatmap, heatmap) } diff --git a/models/fixtures/action.yml b/models/fixtures/action.yml index 34a1a8b2be027..e8a6d531f2b33 100644 --- a/models/fixtures/action.yml +++ b/models/fixtures/action.yml @@ -5,7 +5,7 @@ act_user_id: 2 repo_id: 2 is_private: true - created_unix: 1540139562 + created_unix: 1571686356 - id: 2 diff --git a/models/user_heatmap_test.go b/models/user_heatmap_test.go index a71202d85716e..0b59ee85f759f 100644 --- a/models/user_heatmap_test.go +++ b/models/user_heatmap_test.go @@ -17,7 +17,7 @@ func TestGetUserHeatmapDataByUser(t *testing.T) { CountResult int JSONResult string }{ - {2, 1, `[{"timestamp":1540080000,"contributions":1}]`}, + {2, 1, `[{"timestamp":1571616000,"contributions":1}]`}, {3, 0, `[]`}, } // Prepare From 2d27ecc87816f263749f5e32efecdc5d8c8c62b2 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Mon, 21 Oct 2019 20:55:26 +0100 Subject: [PATCH 2/2] Add hint to check the fixture age --- models/user_heatmap_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user_heatmap_test.go b/models/user_heatmap_test.go index 0b59ee85f759f..f882b3524733d 100644 --- a/models/user_heatmap_test.go +++ b/models/user_heatmap_test.go @@ -41,7 +41,7 @@ func TestGetUserHeatmapDataByUser(t *testing.T) { // Get the heatmap and compare heatmap, err := GetUserHeatmapDataByUser(user) assert.NoError(t, err) - assert.Equal(t, len(actions), len(heatmap)) + assert.Equal(t, len(actions), len(heatmap), "invalid action count: did the test data became too old?") assert.Equal(t, tc.CountResult, len(heatmap)) //Test JSON rendering