Skip to content

Commit

Permalink
Remove envbuilder dependency from devcontainer_test (#115)
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronlehmann authored Mar 27, 2024
1 parent 7d6591f commit 6a88184
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions devcontainer/devcontainer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"strings"
"testing"

"github.com/coder/envbuilder"
"github.com/coder/envbuilder/devcontainer"
"github.com/coder/envbuilder/devcontainer/features"
"github.com/coder/envbuilder/registrytest"
Expand All @@ -23,6 +22,8 @@ import (
"github.com/stretchr/testify/require"
)

const magicDir = "/.envbuilder"

func TestParse(t *testing.T) {
t.Parallel()
raw := `{
Expand Down Expand Up @@ -86,7 +87,7 @@ func TestCompileWithFeatures(t *testing.T) {
dc, err := devcontainer.Parse([]byte(raw))
require.NoError(t, err)
fs := memfs.New()
params, err := dc.Compile(fs, "", envbuilder.MagicDir, "", "")
params, err := dc.Compile(fs, "", magicDir, "", "")
require.NoError(t, err)

// We have to SHA because we get a different MD5 every time!
Expand Down Expand Up @@ -117,10 +118,10 @@ func TestCompileDevContainer(t *testing.T) {
dc := &devcontainer.Spec{
Image: "codercom/code-server:latest",
}
params, err := dc.Compile(fs, "", envbuilder.MagicDir, "", "")
params, err := dc.Compile(fs, "", magicDir, "", "")
require.NoError(t, err)
require.Equal(t, filepath.Join(envbuilder.MagicDir, "Dockerfile"), params.DockerfilePath)
require.Equal(t, envbuilder.MagicDir, params.BuildContext)
require.Equal(t, filepath.Join(magicDir, "Dockerfile"), params.DockerfilePath)
require.Equal(t, magicDir, params.BuildContext)
})
t.Run("WithBuild", func(t *testing.T) {
t.Parallel()
Expand All @@ -143,7 +144,7 @@ func TestCompileDevContainer(t *testing.T) {
_, err = io.WriteString(file, "FROM ubuntu")
require.NoError(t, err)
_ = file.Close()
params, err := dc.Compile(fs, dcDir, envbuilder.MagicDir, "", "/var/workspace")
params, err := dc.Compile(fs, dcDir, magicDir, "", "/var/workspace")
require.NoError(t, err)
require.Equal(t, "ARG1=value1", params.BuildArgs[0])
require.Equal(t, "ARG2=workspace", params.BuildArgs[1])
Expand Down

0 comments on commit 6a88184

Please sign in to comment.