From 3b553750746e58eaf8efbe931102323f3fdbde96 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Fri, 24 Sep 2021 13:12:16 +0200 Subject: [PATCH] webhooks: fix failing test --- webhooks/legacy_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/webhooks/legacy_test.go b/webhooks/legacy_test.go index 54c29765748d49dcbac9038ea5af6c7e05fc8ba6..a0b6d65af6e83d83ef2465889d43be5b76129576 100644 --- a/webhooks/legacy_test.go +++ b/webhooks/legacy_test.go @@ -82,17 +82,11 @@ func TestDelivery(t *testing.T) { })) defer srv.Close() - queue := NewLegacyQueue() - q := sq. - Select(). - From("user_webhook_subscription sub"). - Where(`sub.user_id = ?`, 42) - queue.Schedule(q, "user", "profile:update", []byte(`{"hello": "world"}`)) - db, mock, err := sqlmock.New() if err != nil { panic(err) } + ctx := database.Context(context.Background(), db) // Lookup phase mock.ExpectBegin() @@ -104,13 +98,19 @@ func TestDelivery(t *testing.T) { WithArgs(42, sqlmock.AnyArg()) // Any => events LIKE %profile:update% mock.ExpectCommit() + queue := NewLegacyQueue() + q := sq. + Select(). + From("user_webhook_subscription sub"). + Where(`sub.user_id = ?`, 42) + queue.Schedule(ctx, q, "user", "profile:update", []byte(`{"hello": "world"}`)) + // Schedule phase mock.ExpectBegin() mock.ExpectQuery(`INSERT INTO user_webhook_delivery`). WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(4096)) mock.ExpectCommit() - ctx := database.Context(context.Background(), db) queue.Queue.Dispatch(ctx) assert.Nil(t, mock.ExpectationsWereMet())