diff options
Diffstat (limited to 'internal/gitlabshell/env_test.go')
| -rw-r--r-- | internal/gitlabshell/env_test.go | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/internal/gitlabshell/env_test.go b/internal/gitlabshell/env_test.go index 809a436c2..aad9699ce 100644 --- a/internal/gitlabshell/env_test.go +++ b/internal/gitlabshell/env_test.go @@ -30,13 +30,18 @@ func TestGitHooksConfig(t *testing.T) { config.Config.Logging.Level = "fatal" config.Config.Logging.Format = "my-custom-format" config.Config.GitlabShell.Dir = "../../ruby/gitlab-shell" + config.Config.GitlabShell.SecretFile = "secret_file.very_secret" + config.Config.GitlabShell.CustomHooksDir = "custom_hooks_directory/is/here" + config.Config.GitlabShell.GitlabURL = "http://localhost:1234" dumpConfigPath := filepath.Join(config.Config.Ruby.Dir, "gitlab-shell", "bin", "dump-config") var stdout bytes.Buffer cmd := exec.Command(dumpConfigPath) - cmd.Env = append(os.Environ(), gitlabshell.Env()...) + gitlabshellEnv, err := gitlabshell.Env() + require.NoError(t, err) + cmd.Env = append(os.Environ(), gitlabshellEnv...) cmd.Stdout = &stdout require.NoError(t, cmd.Run()) @@ -46,6 +51,20 @@ func TestGitHooksConfig(t *testing.T) { require.NoError(t, json.NewDecoder(&stdout).Decode(&rubyConfigMap)) require.Equal(t, config.Config.Logging.Level, rubyConfigMap["log_level"]) require.Equal(t, config.Config.Logging.Format, rubyConfigMap["log_format"]) + require.Equal(t, config.Config.GitlabShell.SecretFile, rubyConfigMap["secret_file"]) + require.Equal(t, config.Config.GitlabShell.CustomHooksDir, rubyConfigMap["custom_hooks_dir"]) + require.Equal(t, config.Config.GitlabShell.GitlabURL, rubyConfigMap["gitlab_url"]) + require.Equal(t, config.Config.GitlabShell.SecretFile, rubyConfigMap["secret_file"]) + + // HTTP Settings + httpSettings, ok := rubyConfigMap["http_settings"].(map[string]interface{}) + require.True(t, ok) + require.Equal(t, float64(config.Config.GitlabShell.HTTPSettings.ReadTimeout), httpSettings["read_timeout"]) + require.Equal(t, config.Config.GitlabShell.HTTPSettings.User, httpSettings["user"]) + require.Equal(t, config.Config.GitlabShell.HTTPSettings.Password, httpSettings["password"]) + require.Equal(t, config.Config.GitlabShell.HTTPSettings.CAFile, httpSettings["ca_file"]) + require.Equal(t, config.Config.GitlabShell.HTTPSettings.CAPath, httpSettings["ca_path"]) + require.Equal(t, config.Config.GitlabShell.HTTPSettings.SelfSigned, httpSettings["self_signed_cert"]) dir := filepath.Dir(rubyConfigMap["log_file"].(string)) require.Equal(t, config.Config.Logging.Dir, dir) |