diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2024-01-07 19:05:19 -0500 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2024-01-07 19:05:19 -0500 |
| commit | 4c296d8dacdd03c68a09a2d10266f193d97f5f0e (patch) | |
| tree | 2689dab2c8ebe857eb11169d8f85eab3faf1f7d2 /internal/configloader | |
| parent | Move message normalization to create dirname to fs repo (diff) | |
| download | cli-4c296d8dacdd03c68a09a2d10266f193d97f5f0e.zip | |
Add shared test util package
Diffstat (limited to 'internal/configloader')
| -rw-r--r-- | internal/configloader/configloader_test.go | 48 | ||||
| -rw-r--r-- | internal/configloader/configloader_unix_test.go | 5 | ||||
| -rw-r--r-- | internal/configloader/configloader_windows_test.go | 5 |
3 files changed, 10 insertions, 48 deletions
diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go index 7fb2456..88c7f94 100644 --- a/internal/configloader/configloader_test.go +++ b/internal/configloader/configloader_test.go @@ -5,13 +5,13 @@ import ( "os" "testing" - "github.com/BurntSushi/toml" + "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "gotest.tools/v3/assert" ) func TestNewConfigMigrationsDirDefault(t *testing.T) { - changeCwd(t, os.TempDir()) + bolttest.ChangeCwd(t, os.TempDir()) cfg, err := configloader.NewConfig() assert.NilError(t, err) @@ -31,7 +31,7 @@ func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) { Driver: "postgres", }, } - createConfigFile(t, &expectedCfg, "bolt.toml") + bolttest.CreateConfigFile(t, &expectedCfg, "bolt.toml") cfg, err := configloader.NewConfig() assert.NilError(t, err) @@ -50,7 +50,7 @@ func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) { Driver: "mysql", }, } - createConfigFile(t, &fileCfg, "bolt.toml") + bolttest.CreateConfigFile(t, &fileCfg, "bolt.toml") envCfg := configloader.Config{ MigrationsDir: "envmigrations", @@ -75,43 +75,3 @@ func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) { assert.NilError(t, err) assert.DeepEqual(t, *cfg, envCfg) } - -func createConfigFile(t *testing.T, cfg *configloader.Config, filePath string) { - f := createTempFile(t, filePath) - - encoder := toml.NewEncoder(f) - err := encoder.Encode(cfg) - assert.NilError(t, err) - - err = f.Close() - assert.NilError(t, err) -} - -func createTempFile(t *testing.T, filePath string) *os.File { - f, err := os.Create(filePath) - assert.NilError(t, err) - - t.Cleanup(func() { - err = os.Remove(f.Name()) - if err != nil { - t.Fatal(err) - } - }) - - return f -} - -func changeCwd(t *testing.T, path string) { - dir, err := os.Getwd() - assert.NilError(t, err) - - err = os.Chdir(path) - assert.NilError(t, err) - - t.Cleanup(func() { - err = os.Chdir(dir) - if err != nil { - t.Fatal(err) - } - }) -} diff --git a/internal/configloader/configloader_unix_test.go b/internal/configloader/configloader_unix_test.go index 5c65c37..412ef47 100644 --- a/internal/configloader/configloader_unix_test.go +++ b/internal/configloader/configloader_unix_test.go @@ -6,6 +6,7 @@ import ( "os" "testing" + "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "gotest.tools/v3/assert" ) @@ -14,11 +15,11 @@ func TestNewConfigUnixSearchesToRootFilePath(t *testing.T) { expectedCfg := configloader.Config{ MigrationsDir: "differentmigrationsdir", } - createConfigFile(t, &expectedCfg, "/bolt.toml") + bolttest.CreateConfigFile(t, &expectedCfg, "/bolt.toml") homedir, err := os.UserHomeDir() assert.NilError(t, err) - changeCwd(t, homedir) + bolttest.ChangeCwd(t, homedir) cfg, err := configloader.NewConfig() assert.NilError(t, err) diff --git a/internal/configloader/configloader_windows_test.go b/internal/configloader/configloader_windows_test.go index cc044b1..5c8cee9 100644 --- a/internal/configloader/configloader_windows_test.go +++ b/internal/configloader/configloader_windows_test.go @@ -7,6 +7,7 @@ import ( "path/filepath" "testing" + "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "gotest.tools/v3/assert" ) @@ -16,12 +17,12 @@ func TestNewConfigWindowsSearchesToRootFilePath(t *testing.T) { MigrationsDir: "differentmigrationsdir", } configPath := filepath.Join(os.Getenv("SystemDrive"), "bolt.toml") - createConfigFile(t, &expectedCfg, configPath) + bolttest.CreateConfigFile(t, &expectedCfg, configPath) assert.NilError(t, err) homedir, err := os.UserHomeDir() assert.NilError(t, err) - changeCwd(t, homedir) + bolttest.ChangeCwd(t, homedir) cfg, err := configloader.NewConfig() assert.NilError(t, err) |