Skip to content

Commit 6a88184

Browse files
authored
Remove envbuilder dependency from devcontainer_test (#115)
1 parent 7d6591f commit 6a88184

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

devcontainer/devcontainer_test.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"strings"
1111
"testing"
1212

13-
"github.com/coder/envbuilder"
1413
"github.com/coder/envbuilder/devcontainer"
1514
"github.com/coder/envbuilder/devcontainer/features"
1615
"github.com/coder/envbuilder/registrytest"
@@ -23,6 +22,8 @@ import (
2322
"github.com/stretchr/testify/require"
2423
)
2524

25+
const magicDir = "/.envbuilder"
26+
2627
func TestParse(t *testing.T) {
2728
t.Parallel()
2829
raw := `{
@@ -86,7 +87,7 @@ func TestCompileWithFeatures(t *testing.T) {
8687
dc, err := devcontainer.Parse([]byte(raw))
8788
require.NoError(t, err)
8889
fs := memfs.New()
89-
params, err := dc.Compile(fs, "", envbuilder.MagicDir, "", "")
90+
params, err := dc.Compile(fs, "", magicDir, "", "")
9091
require.NoError(t, err)
9192

9293
// We have to SHA because we get a different MD5 every time!
@@ -117,10 +118,10 @@ func TestCompileDevContainer(t *testing.T) {
117118
dc := &devcontainer.Spec{
118119
Image: "codercom/code-server:latest",
119120
}
120-
params, err := dc.Compile(fs, "", envbuilder.MagicDir, "", "")
121+
params, err := dc.Compile(fs, "", magicDir, "", "")
121122
require.NoError(t, err)
122-
require.Equal(t, filepath.Join(envbuilder.MagicDir, "Dockerfile"), params.DockerfilePath)
123-
require.Equal(t, envbuilder.MagicDir, params.BuildContext)
123+
require.Equal(t, filepath.Join(magicDir, "Dockerfile"), params.DockerfilePath)
124+
require.Equal(t, magicDir, params.BuildContext)
124125
})
125126
t.Run("WithBuild", func(t *testing.T) {
126127
t.Parallel()
@@ -143,7 +144,7 @@ func TestCompileDevContainer(t *testing.T) {
143144
_, err = io.WriteString(file, "FROM ubuntu")
144145
require.NoError(t, err)
145146
_ = file.Close()
146-
params, err := dc.Compile(fs, dcDir, envbuilder.MagicDir, "", "/var/workspace")
147+
params, err := dc.Compile(fs, dcDir, magicDir, "", "/var/workspace")
147148
require.NoError(t, err)
148149
require.Equal(t, "ARG1=value1", params.BuildArgs[0])
149150
require.Equal(t, "ARG2=workspace", params.BuildArgs[1])

0 commit comments

Comments
 (0)