Revert moving mockFs to testutils.

Author: 0xgouda

internal/testutil/mocks.go

@@ -3,7 +3,6 @@ package testutil
 import (
 	"context"
 	"errors"
-	"io/fs"
 
 	"github.com/cybertec-postgresql/pgwatch/v3/api/pb"
 	"github.com/cybertec-postgresql/pgwatch/v3/internal/metrics"
@@ -106,11 +105,3 @@ func (m *MockSourcesReaderWriter) DeleteSource(name string) error {
 func (m *MockSourcesReaderWriter) WriteSources(srcs sources.Sources) error {
 	return m.WriteSourcesFunc(srcs)
 }
-
-type MockFS struct {
-	OpenFunc func(name string) (fs.File, error)
-}
-
-func (m MockFS) Open(name string) (fs.File, error) {
-	return m.OpenFunc(name)
-}

internal/webserver/webserver_test.go

@@ -11,11 +11,18 @@ import (
 	"testing"
 
 	"github.com/cybertec-postgresql/pgwatch/v3/internal/metrics"
-	"github.com/cybertec-postgresql/pgwatch/v3/internal/testutil"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 )
 
+type mockFS struct {
+	OpenFunc func(name string) (fs.File, error)
+}
+
+func (m mockFS) Open(name string) (fs.File, error) {
+	return m.OpenFunc(name)
+}
+
 
 func TestServer_handleStatic(t *testing.T) {
 	tempFile := path.Join(t.TempDir(), "file.ext")
@@ -27,7 +34,7 @@ func TestServer_handleStatic(t *testing.T) {
 	origUIFS := uiFS
 	defer func() { uiFS = origUIFS }()
 
-	uiFS = testutil.MockFS{
+	uiFS = mockFS{
 		OpenFunc: func(name string) (fs.File, error) {
 			switch name {
 			case "index.html", "static/file.ext":