aboutsummaryrefslogtreecommitdiffstats
path: root/internal/configloader
diff options
context:
space:
mode:
authorEugene Triguba <eugenetriguba@gmail.com>2024-03-09 12:07:30 -0500
committerEugene Triguba <eugenetriguba@gmail.com>2024-03-09 12:07:30 -0500
commit18cbade269362a3fed5763e2b1b39be33ba56aaf (patch)
treed31df309169381b83f9cad67da15f38d0b3cccc6 /internal/configloader
parentAdd mysql docker compose file and use matrix in workflow (diff)
downloadcli-18cbade269362a3fed5763e2b1b39be33ba56aaf.zip
Fix tests to work without Dockerfile.test
Diffstat (limited to 'internal/configloader')
-rw-r--r--internal/configloader/configloader_test.go42
-rw-r--r--internal/configloader/configloader_unix_test.go31
-rw-r--r--internal/configloader/configloader_windows_test.go34
3 files changed, 41 insertions, 66 deletions
diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go
index 0ad6930..6aa3b45 100644
--- a/internal/configloader/configloader_test.go
+++ b/internal/configloader/configloader_test.go
@@ -3,6 +3,7 @@ package configloader_test
import (
"fmt"
"os"
+ "path/filepath"
"testing"
"github.com/eugenetriguba/bolt/internal/bolttest"
@@ -35,6 +36,14 @@ func TestNewConfigWithInvalidVersionStyle(t *testing.T) {
}
func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) {
+ bolttest.UnsetEnv(t, "BOLT_DB_CONN_HOST")
+ bolttest.UnsetEnv(t, "BOLT_DB_CONN_PORT")
+ bolttest.UnsetEnv(t, "BOLT_DB_CONN_USER")
+ bolttest.UnsetEnv(t, "BOLT_DB_CONN_PASSWORD")
+ bolttest.UnsetEnv(t, "BOLT_DB_CONN_DBNAME")
+ bolttest.UnsetEnv(t, "BOLT_DB_CONN_DRIVER")
+ bolttest.UnsetEnv(t, "BOLT_MIGRATIONS_DIR_PATH")
+ bolttest.UnsetEnv(t, "BOLT_MIGRATIONS_VERSION_STYLE")
expectedCfg := configloader.Config{
Migrations: configloader.MigrationsConfig{
DirectoryPath: "myfancymigrations",
@@ -49,9 +58,12 @@ func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) {
Driver: "postgres",
},
}
- bolttest.CreateConfigFile(t, &expectedCfg, "bolt.toml")
+ tmpdir := t.TempDir()
+ bolttest.ChangeCwd(t, tmpdir)
+ bolttest.CreateConfigFile(t, &expectedCfg, filepath.Join(tmpdir, "bolt.toml"))
cfg, err := configloader.NewConfig()
+
assert.Nil(t, err)
assert.DeepEqual(t, *cfg, expectedCfg)
}
@@ -100,3 +112,31 @@ func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) {
assert.Nil(t, err)
assert.DeepEqual(t, *cfg, envCfg)
}
+
+func TestNewConfigSearchesParentDirectories(t *testing.T) {
+ bolttest.UnsetEnv(t, "BOLT_DB_CONN_HOST")
+ bolttest.UnsetEnv(t, "BOLT_DB_CONN_PORT")
+ bolttest.UnsetEnv(t, "BOLT_DB_CONN_USER")
+ bolttest.UnsetEnv(t, "BOLT_DB_CONN_PASSWORD")
+ bolttest.UnsetEnv(t, "BOLT_DB_CONN_DBNAME")
+ bolttest.UnsetEnv(t, "BOLT_DB_CONN_DRIVER")
+ bolttest.UnsetEnv(t, "BOLT_MIGRATIONS_DIR_PATH")
+ bolttest.UnsetEnv(t, "BOLT_MIGRATIONS_VERSION_STYLE")
+ expectedCfg := configloader.Config{
+ Migrations: configloader.MigrationsConfig{
+ DirectoryPath: "differentmigrationsdir",
+ VersionStyle: configloader.VersionStyleSequential,
+ },
+ }
+ tmpdir := t.TempDir()
+ bolttest.CreateConfigFile(t, &expectedCfg, filepath.Join(tmpdir, "bolt.toml"))
+ nestedTmpDir := filepath.Join(tmpdir, "nested-dir", "nested-x2-dir")
+ err := os.MkdirAll(nestedTmpDir, 0755)
+ assert.Nil(t, err)
+ bolttest.ChangeCwd(t, nestedTmpDir)
+
+ cfg, err := configloader.NewConfig()
+ assert.Nil(t, err)
+
+ assert.DeepEqual(t, *cfg, expectedCfg)
+}
diff --git a/internal/configloader/configloader_unix_test.go b/internal/configloader/configloader_unix_test.go
deleted file mode 100644
index 8043bdb..0000000
--- a/internal/configloader/configloader_unix_test.go
+++ /dev/null
@@ -1,31 +0,0 @@
-//go:build unix
-
-package configloader_test
-
-import (
- "os"
- "testing"
-
- "github.com/eugenetriguba/bolt/internal/bolttest"
- "github.com/eugenetriguba/bolt/internal/configloader"
- "github.com/eugenetriguba/checkmate/assert"
-)
-
-func TestNewConfigUnixSearchesToRootFilePath(t *testing.T) {
- expectedCfg := configloader.Config{
- Migrations: configloader.MigrationsConfig{
- DirectoryPath: "differentmigrationsdir",
- VersionStyle: configloader.VersionStyleSequential,
- },
- }
- bolttest.CreateConfigFile(t, &expectedCfg, "/bolt.toml")
-
- homedir, err := os.UserHomeDir()
- assert.Nil(t, err)
- bolttest.ChangeCwd(t, homedir)
-
- cfg, err := configloader.NewConfig()
- assert.Nil(t, err)
-
- assert.DeepEqual(t, *cfg, expectedCfg)
-}
diff --git a/internal/configloader/configloader_windows_test.go b/internal/configloader/configloader_windows_test.go
deleted file mode 100644
index 1ba6c51..0000000
--- a/internal/configloader/configloader_windows_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-//go:build windows
-
-package configloader_test
-
-import (
- "os"
- "path/filepath"
- "testing"
-
- "github.com/eugenetriguba/bolt/internal/bolttest"
- "github.com/eugenetriguba/bolt/internal/configloader"
- "github.com/eugenetriguba/checkmate/assert"
-)
-
-func TestNewConfigWindowsSearchesToRootFilePath(t *testing.T) {
- expectedCfg := configloader.Config{
- Migrations: configloader.MigrationsConfig{
- DirectoryPath: "differentmigrationsdir",
- VersionStyle: configloader.VersionStyleSequential,
- },
- }
- configPath := filepath.Join(os.Getenv("SystemDrive"), "bolt.toml")
- bolttest.CreateConfigFile(t, &expectedCfg, configPath)
- assert.Nil(t, err)
-
- homedir, err := os.UserHomeDir()
- assert.Nil(t, err)
- bolttest.ChangeCwd(t, homedir)
-
- cfg, err := configloader.NewConfig()
- assert.Nil(t, err)
-
- assert.DeepEqual(t, *cfg, expectedCfg)
-}