Merge branch 'master' of https://code.haedhutner.dev/haedhutner/pilgrim
This commit is contained in:
commit
12983e395b
1 changed files with 20 additions and 13 deletions
|
@ -11,20 +11,10 @@ import (
|
||||||
const CliUrlValue = "postgres://cli_host:5432/cli_segment1/cli_segment2?cli_arg1=cli_val1&cli_arg2=cli_val2"
|
const CliUrlValue = "postgres://cli_host:5432/cli_segment1/cli_segment2?cli_arg1=cli_val1&cli_arg2=cli_val2"
|
||||||
const CliDriverValue = pilgrim_conf.DbDriver_Postgres
|
const CliDriverValue = pilgrim_conf.DbDriver_Postgres
|
||||||
|
|
||||||
func runTest(
|
func setupMockDefaults(
|
||||||
setupMocks func(
|
env *pilgrim_mock.EnvVarRetriever,
|
||||||
env *pilgrim_mock.EnvVarRetriever,
|
cli *pilgrim_mock.CliFlagRetriever,
|
||||||
cli *pilgrim_mock.CliFlagRetriever,
|
|
||||||
),
|
|
||||||
test func(
|
|
||||||
env *pilgrim_mock.EnvVarRetriever,
|
|
||||||
cli *pilgrim_mock.CliFlagRetriever,
|
|
||||||
),
|
|
||||||
) {
|
) {
|
||||||
env, cli := new(pilgrim_mock.EnvVarRetriever), new(pilgrim_mock.CliFlagRetriever)
|
|
||||||
|
|
||||||
setupMocks(env, cli)
|
|
||||||
|
|
||||||
env.EXPECT().Url().Return("", false)
|
env.EXPECT().Url().Return("", false)
|
||||||
env.EXPECT().Driver().Return(pilgrim_conf.DbDriver_Postgres, false)
|
env.EXPECT().Driver().Return(pilgrim_conf.DbDriver_Postgres, false)
|
||||||
env.EXPECT().Username().Return("", false)
|
env.EXPECT().Username().Return("", false)
|
||||||
|
@ -56,6 +46,23 @@ func runTest(
|
||||||
cli.EXPECT().IsValidatingMigrationOrder().Return(false, false)
|
cli.EXPECT().IsValidatingMigrationOrder().Return(false, false)
|
||||||
cli.EXPECT().IsValidatingLatest().Return(false, false)
|
cli.EXPECT().IsValidatingLatest().Return(false, false)
|
||||||
cli.EXPECT().IsValidatingChecksums().Return(false, false)
|
cli.EXPECT().IsValidatingChecksums().Return(false, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
func runTest(
|
||||||
|
setupMocks func(
|
||||||
|
env *pilgrim_mock.EnvVarRetriever,
|
||||||
|
cli *pilgrim_mock.CliFlagRetriever,
|
||||||
|
),
|
||||||
|
test func(
|
||||||
|
env *pilgrim_mock.EnvVarRetriever,
|
||||||
|
cli *pilgrim_mock.CliFlagRetriever,
|
||||||
|
),
|
||||||
|
) {
|
||||||
|
env, cli := new(pilgrim_mock.EnvVarRetriever), new(pilgrim_mock.CliFlagRetriever)
|
||||||
|
|
||||||
|
setupMocks(env, cli)
|
||||||
|
|
||||||
|
setupMockDefaults(env, cli)
|
||||||
|
|
||||||
test(env, cli)
|
test(env, cli)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue