chore: update unit tests

supabase · Jan 7, 2025 · 30af3d2 · 30af3d2
1 parent f4a816b
commit 30af3d2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/internal/db/branch/switch_/switch__test.go b/internal/db/branch/switch_/switch__test.go
@@ -79,7 +79,7 @@ func TestSwitchCommand(t *testing.T) {
 		// Run test
 		err := Run(context.Background(), "target", fsys)
 		// Check error
-		assert.ErrorContains(t, err, "toml: line 0: unexpected EOF; expected key separator '='")
+		assert.ErrorContains(t, err, "toml: expected = after a key, but the document ends there")
 	})
 
 	t.Run("throws error on missing database", func(t *testing.T) {

diff --git a/internal/start/start_test.go b/internal/start/start_test.go
@@ -37,7 +37,7 @@ func TestStartCommand(t *testing.T) {
 		// Run test
 		err := Run(context.Background(), fsys, []string{}, false)
 		// Check error
-		assert.ErrorContains(t, err, "toml: line 0: unexpected EOF; expected key separator '='")
+		assert.ErrorContains(t, err, "toml: expected = after a key, but the document ends there")
 	})
 
 	t.Run("throws error on missing docker", func(t *testing.T) {

diff --git a/internal/status/status_test.go b/internal/status/status_test.go
@@ -59,7 +59,7 @@ func TestStatusCommand(t *testing.T) {
 		// Run test
 		err := Run(context.Background(), CustomName{}, utils.OutputPretty, fsys)
 		// Check error
-		assert.ErrorContains(t, err, "toml: line 0: unexpected EOF; expected key separator '='")
+		assert.ErrorContains(t, err, "toml: expected = after a key, but the document ends there")
 	})
 
 	t.Run("throws error on missing docker", func(t *testing.T) {

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -387,8 +387,8 @@ func (c *config) loadFromFile(filename string, fsys fs.FS) error {
 	var buf bytes.Buffer
 	if err := initConfigTemplate.Option("missingkey=zero").Execute(&buf, c); err != nil {
 		return errors.Errorf("failed to initialise template config: %w", err)
-	} else if err := v.MergeConfig(&buf); err != nil {
-		return errors.Errorf("failed to merge template config: %w", err)
+	} else if err := c.loadFromReader(v, &buf); err != nil {
+		return err
 	}
 	// Load custom config
 	if ext := filepath.Ext(filename); len(ext) > 0 {
@@ -399,8 +399,12 @@ func (c *config) loadFromFile(filename string, fsys fs.FS) error {
 		return errors.Errorf("failed to read file config: %w", err)
 	}
 	defer f.Close()
-	if err := v.MergeConfig(f); err != nil {
-		return errors.Errorf("failed to merge file config: %w", err)
+	return c.loadFromReader(v, f)
+}
+
+func (c *config) loadFromReader(v *viper.Viper, r io.Reader) error {
+	if err := v.MergeConfig(r); err != nil {
+		return errors.Errorf("failed to merge config: %w", err)
 	}
 	// Manually parse [functions.*] to empty struct for backwards compatibility
 	for key, value := range v.GetStringMap("functions") {