chore: refactor: move gittest and registrytest to testutil

johnstcn · johnstcn · commit dcc367761bc8 · 2024-04-25T10:52:13.000Z
diff --git a/devcontainer/devcontainer_test.go b/devcontainer/devcontainer_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/coder/envbuilder/devcontainer"
 	"github.com/coder/envbuilder/devcontainer/features"
-	"github.com/coder/envbuilder/registrytest"
+	"github.com/coder/envbuilder/testutil/registrytest"
 	"github.com/go-git/go-billy/v5/memfs"
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
diff --git a/devcontainer/features/features_test.go b/devcontainer/features/features_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/coder/envbuilder/devcontainer/features"
-	"github.com/coder/envbuilder/registrytest"
+	"github.com/coder/envbuilder/testutil/registrytest"
 	"github.com/go-git/go-billy/v5/memfs"
 	"github.com/stretchr/testify/require"
 )
diff --git a/git_test.go b/git_test.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/coder/envbuilder"
-	"github.com/coder/envbuilder/gittest"
+	"github.com/coder/envbuilder/testutil/gittest"
 	"github.com/go-git/go-billy/v5"
 	"github.com/go-git/go-billy/v5/memfs"
 	"github.com/go-git/go-git/v5"
diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/coder/envbuilder"
 	"github.com/coder/envbuilder/devcontainer/features"
-	"github.com/coder/envbuilder/gittest"
-	"github.com/coder/envbuilder/registrytest"
+	"github.com/coder/envbuilder/testutil/gittest"
+	"github.com/coder/envbuilder/testutil/registrytest"
 	clitypes "github.com/docker/cli/cli/config/types"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
diff --git a/testutil/gittest/gittest.go b/testutil/gittest/gittest.go
diff --git a/testutil/registrytest/registrytest.go b/testutil/registrytest/registrytest.go

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`
`7`	`7`	`"github.com/coder/envbuilder/devcontainer/features"`
`8`		`- "github.com/coder/envbuilder/registrytest"`
	`8`	`+ "github.com/coder/envbuilder/testutil/registrytest"`
`9`	`9`	`"github.com/go-git/go-billy/v5/memfs"`
`10`	`10`	`"github.com/stretchr/testify/require"`
`11`	`11`	`)`