Skip to content

Commit 22b1482

Browse files
committed
cleanup
1 parent c352822 commit 22b1482

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

coderd/notifications/reports/generator_internal_test.go

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,17 @@ import (
77
"github.com/prometheus/client_golang/prometheus"
88
"github.com/stretchr/testify/require"
99

10+
"cdr.dev/slog"
1011
"cdr.dev/slog/sloggers/slogtest"
12+
"github.com/coder/quartz"
13+
1114
"github.com/coder/coder/v2/coderd/coderdtest"
15+
"github.com/coder/coder/v2/coderd/database"
1216
"github.com/coder/coder/v2/coderd/database/dbauthz"
1317
"github.com/coder/coder/v2/coderd/database/dbtestutil"
18+
"github.com/coder/coder/v2/coderd/notifications"
1419
"github.com/coder/coder/v2/coderd/rbac"
1520
"github.com/coder/coder/v2/testutil"
16-
"github.com/coder/quartz"
1721
)
1822

1923
func TestReportFailedWorkspaceBuilds(t *testing.T) {
@@ -22,20 +26,16 @@ func TestReportFailedWorkspaceBuilds(t *testing.T) {
2226
t.Run("FailedBuilds_TemplateAdminOptIn_FirstRun_Report_SecondRunTooEarly_NoReport_ThirdRun_Report", func(t *testing.T) {
2327
t.Parallel()
2428

25-
// Prepare dependencies
26-
logger := slogtest.Make(t, &slogtest.Options{})
27-
rdb, _ := dbtestutil.NewDB(t)
28-
db := dbauthz.New(rdb, rbac.NewAuthorizer(prometheus.NewRegistry()), logger, coderdtest.AccessControlStorePointer())
29-
notifyEnq := &testutil.FakeNotificationsEnqueuer{}
30-
clk := quartz.NewMock(t)
29+
// Setup
30+
logger, db, notifEnq, clk := setup(t)
3131

3232
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)
3333
defer cancel()
3434

3535
// Given
3636

3737
// When
38-
err := reportFailedWorkspaceBuilds(ctx, logger, db, notifyEnq, clk)
38+
err := reportFailedWorkspaceBuilds(ctx, logger, db, notifEnq, clk)
3939
require.NoError(t, err)
4040

4141
// Then
@@ -58,3 +58,14 @@ func TestReportFailedWorkspaceBuilds(t *testing.T) {
5858
// TODO
5959
})
6060
}
61+
62+
func setup(t *testing.T) (slog.Logger, database.Store, notifications.Enqueuer, quartz.Clock) {
63+
t.Helper()
64+
65+
logger := slogtest.Make(t, &slogtest.Options{})
66+
rdb, _ := dbtestutil.NewDB(t)
67+
db := dbauthz.New(rdb, rbac.NewAuthorizer(prometheus.NewRegistry()), logger, coderdtest.AccessControlStorePointer())
68+
notifyEnq := &testutil.FakeNotificationsEnqueuer{}
69+
clk := quartz.NewMock(t)
70+
return logger, db, notifyEnq, clk
71+
}

0 commit comments

Comments
 (0)