Skip to content

Commit

Permalink
Update to Atmos 1.79.0
Browse files Browse the repository at this point in the history
  • Loading branch information
aknysh committed Jun 9, 2024
1 parent 9055813 commit e725391
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions internal/merge/merge_test.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package merge

import (
m "github.com/cloudposse/atmos/pkg/merge"
"github.com/stretchr/testify/assert"
"testing"

m "github.com/cloudposse/atmos/pkg/merge"
"github.com/cloudposse/atmos/pkg/schema"
)

func TestMergeBasic(t *testing.T) {
Expand All @@ -13,7 +15,7 @@ func TestMergeBasic(t *testing.T) {
inputs := []map[any]any{map1, map2}
expected := map[any]any{"foo": "bar", "baz": "bat"}

result, err := m.Merge(inputs)
result, err := m.Merge(schema.CliConfiguration{}, inputs)
assert.Nil(t, err)
assert.Equal(t, expected, result)
}
Expand All @@ -26,7 +28,7 @@ func TestMergeBasicOverride(t *testing.T) {
inputs := []map[any]any{map1, map2, map3}
expected := map[any]any{"foo": "ood", "baz": "bat"}

result, err := m.Merge(inputs)
result, err := m.Merge(schema.CliConfiguration{}, inputs)
assert.Nil(t, err)
assert.Equal(t, expected, result)
}

0 comments on commit e725391

Please sign in to comment.