chore: move notiffake to testutil (#13933)

mtojek · web-flow · commit 91cbe679c06a · 2024-07-18T13:36:02.000Z
diff --git a/coderd/autobuild/lifecycle_executor_test.go b/coderd/autobuild/lifecycle_executor_test.go
@@ -18,7 +18,6 @@ import (
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
-	"github.com/coder/coder/v2/coderd/notifications/notiffake"
 	"github.com/coder/coder/v2/coderd/schedule"
 	"github.com/coder/coder/v2/coderd/schedule/cron"
 	"github.com/coder/coder/v2/coderd/util/ptr"
@@ -116,7 +115,7 @@ func TestExecutorAutostartTemplateUpdated(t *testing.T) {
 				tickCh   = make(chan time.Time)
 				statsCh  = make(chan autobuild.Stats)
 				logger   = slogtest.Make(t, &slogtest.Options{IgnoreErrors: !tc.expectStart}).Leveled(slog.LevelDebug)
-				enqueuer = notiffake.FakeNotificationEnqueuer{}
+				enqueuer = testutil.FakeNotificationEnqueuer{}
 				client   = coderdtest.New(t, &coderdtest.Options{
 					AutobuildTicker:          tickCh,
 					IncludeProvisionerDaemon: true,
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -65,7 +65,6 @@ import (
 	"github.com/coder/coder/v2/coderd/gitsshkey"
 	"github.com/coder/coder/v2/coderd/httpmw"
 	"github.com/coder/coder/v2/coderd/notifications"
-	"github.com/coder/coder/v2/coderd/notifications/notiffake"
 	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/coderd/schedule"
 	"github.com/coder/coder/v2/coderd/telemetry"
@@ -243,7 +242,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
 	}
 
 	if options.NotificationsEnqueuer == nil {
-		options.NotificationsEnqueuer = new(notiffake.FakeNotificationEnqueuer)
+		options.NotificationsEnqueuer = new(testutil.FakeNotificationEnqueuer)
 	}
 
 	accessControlStore := &atomic.Pointer[dbauthz.AccessControlStore]{}
diff --git a/testutil/notifications.go b/testutil/notifications.go
@@ -1,4 +1,4 @@
-package notiffake
+package testutil
 
 import (
 	"context"

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ import (`
`65`	`65`	`"github.com/coder/coder/v2/coderd/gitsshkey"`
`66`	`66`	`"github.com/coder/coder/v2/coderd/httpmw"`
`67`	`67`	`"github.com/coder/coder/v2/coderd/notifications"`
`68`		`- "github.com/coder/coder/v2/coderd/notifications/notiffake"`
`69`	`68`	`"github.com/coder/coder/v2/coderd/rbac"`
`70`	`69`	`"github.com/coder/coder/v2/coderd/schedule"`
`71`	`70`	`"github.com/coder/coder/v2/coderd/telemetry"`
`@@ -243,7 +242,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can`
`243`	`242`	`}`
`244`	`243`
`245`	`244`	`if options.NotificationsEnqueuer == nil {`
`246`		`- options.NotificationsEnqueuer = new(notiffake.FakeNotificationEnqueuer)`
	`245`	`+ options.NotificationsEnqueuer = new(testutil.FakeNotificationEnqueuer)`
`247`	`246`	`}`
`248`	`247`
`249`	`248`	`accessControlStore := &atomic.Pointer[dbauthz.AccessControlStore]{}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package notiffake`
	`1`	`+package testutil`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`