diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2024-01-06 20:38:32 -0500 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2024-01-06 20:38:32 -0500 |
| commit | 4761a2ead23b63f6b44ab9fdc12959e7a0a5f151 (patch) | |
| tree | 2907626874158723656a6da36aa1b5a1d57d58bf /internal/configloader | |
| parent | Break up migration repo into fs and db with a service (diff) | |
| download | cli-4761a2ead23b63f6b44ab9fdc12959e7a0a5f151.zip | |
Fix configloader/tweak tests
Diffstat (limited to 'internal/configloader')
| -rw-r--r-- | internal/configloader/configloader.go | 4 | ||||
| -rw-r--r-- | internal/configloader/configloader_test.go | 77 | ||||
| -rw-r--r-- | internal/configloader/configloader_unix_test.go | 36 | ||||
| -rw-r--r-- | internal/configloader/configloader_windows_test.go | 38 |
4 files changed, 153 insertions, 2 deletions
diff --git a/internal/configloader/configloader.go b/internal/configloader/configloader.go index b97e1bc..4872354 100644 --- a/internal/configloader/configloader.go +++ b/internal/configloader/configloader.go @@ -52,7 +52,7 @@ func NewConfig() (*Config, error) { return nil, err } - cfg := &Config{} + cfg := Config{} _, err = toml.DecodeFile(filePath, &cfg) if err != nil { return nil, err @@ -67,7 +67,7 @@ func NewConfig() (*Config, error) { cfg.MigrationsDir = "migrations" } - return cfg, nil + return &cfg, nil } func findConfigFilePath() (filePath string, err error) { diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go new file mode 100644 index 0000000..084bb8a --- /dev/null +++ b/internal/configloader/configloader_test.go @@ -0,0 +1,77 @@ +package configloader_test + +import ( + "os" + "testing" + + "github.com/BurntSushi/toml" + "github.com/eugenetriguba/bolt/internal/configloader" + "gotest.tools/v3/assert" +) + +func TestNewConfigMigrationsDirDefault(t *testing.T) { + cfg, err := configloader.NewConfig() + if err != nil { + t.Fatalf("%s occurred during new config", err) + } + + assert.Equal(t, cfg.MigrationsDir, "migrations") +} + +func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) { + expectedCfg := configloader.Config{ + MigrationsDir: "migrations", + Connection: configloader.ConnectionConfig{ + Host: "testhost", + Port: 1234, + User: "testuser", + Password: "testpassword", + DBName: "testdb", + Driver: "postgres", + }, + } + err := createConfigFile(t, &expectedCfg, "bolt.toml") + if err != nil { + t.Fatalf("%s occurred during config file creation", err) + } + + cfg, err := configloader.NewConfig() + if err != nil { + t.Fatalf("%s occurred during new config", err) + } + + assert.DeepEqual(t, *cfg, expectedCfg) +} + +func createConfigFile(t *testing.T, cfg *configloader.Config, filePath string) error { + f, err := createTempFile(t, filePath) + if err != nil { + return err + } + + encoder := toml.NewEncoder(f) + err = encoder.Encode(cfg) + if err != nil { + return err + } + + err = f.Close() + if err != nil { + return err + } + + return nil +} + +func createTempFile(t *testing.T, filePath string) (*os.File, error) { + f, err := os.Create(filePath) + if err != nil { + return nil, err + } + + t.Cleanup(func() { + os.Remove(f.Name()) + }) + + return f, nil +} diff --git a/internal/configloader/configloader_unix_test.go b/internal/configloader/configloader_unix_test.go new file mode 100644 index 0000000..f40a6bb --- /dev/null +++ b/internal/configloader/configloader_unix_test.go @@ -0,0 +1,36 @@ +//go:build unix + +package configloader_test + +import ( + "os" + "testing" + + "github.com/eugenetriguba/bolt/internal/configloader" + "gotest.tools/v3/assert" +) + +func TestNewConfigUnixSearchesToRootFilePath(t *testing.T) { + expectedCfg := configloader.Config{ + MigrationsDir: "differentmigrationsdir", + } + err := createConfigFile(t, &expectedCfg, "/bolt.toml") + if err != nil { + t.Fatal(err) + } + homedir, err := os.UserHomeDir() + if err != nil { + t.Fatal(err) + } + err = os.Chdir(homedir) + if err != nil { + t.Fatal(err) + } + + cfg, err := configloader.NewConfig() + if err != nil { + t.Fatal(err) + } + + assert.DeepEqual(t, *cfg, expectedCfg) +} diff --git a/internal/configloader/configloader_windows_test.go b/internal/configloader/configloader_windows_test.go new file mode 100644 index 0000000..5b5ed79 --- /dev/null +++ b/internal/configloader/configloader_windows_test.go @@ -0,0 +1,38 @@ +//go:build windows + +package configloader_test + +import ( + "os" + "path/filepath" + "testing" + + "github.com/eugenetriguba/bolt/internal/configloader" + "gotest.tools/v3/assert" +) + +func TestNewConfigWindowsSearchesToRootFilePath(t *testing.T) { + expectedCfg := configloader.Config{ + MigrationsDir: "differentmigrationsdir", + } + configPath := filepath.Join(os.Getenv("SystemDrive"), "bolt.toml") + err := createConfigFile(t, &expectedCfg, configPath) + if err != nil { + t.Fatal(err) + } + homedir, err := os.UserHomeDir() + if err != nil { + t.Fatal(err) + } + err = os.Chdir(homedir) + if err != nil { + t.Fatal(err) + } + + cfg, err := configloader.NewConfig() + if err != nil { + t.Fatal(err) + } + + assert.DeepEqual(t, *cfg, expectedCfg) +} |