Skip to content

Commit eedfa33

Browse files
fix unit test
Signed-off-by: pbhatnagar-oss <[email protected]>
1 parent 4840a39 commit eedfa33

File tree

1 file changed

+5
-41
lines changed

1 file changed

+5
-41
lines changed

controller/hydrator_dependencies_test.go

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -14,43 +14,9 @@ import (
1414
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
1515
"github.com/argoproj/argo-cd/v3/reposerver/apiclient"
1616
"github.com/argoproj/argo-cd/v3/test"
17+
"github.com/argoproj/argo-cd/v3/util/settings"
1718
)
1819

19-
var commitMessageTemplate = ` {{- if .metadata }}
20-
{{- if .metadata.repoURL }}
21-
repoURL: {{ .metadata.repoURL }}
22-
{{- end }}
23-
24-
{{- if .metadata.drySha }}
25-
drySha: {{ .metadata.drySha }}
26-
{{- end }}
27-
28-
{{- if .metadata.author }}
29-
Co-authored-by: {{ .metadata.author }}
30-
{{- end }}
31-
32-
{{- if .metadata.subject }}
33-
subject: {{ .metadata.subject }}
34-
{{- end }}
35-
36-
{{- if .metadata.body }}
37-
body: {{ .metadata.body }}
38-
{{- end }}
39-
{{- if .metadata.references }}
40-
References:
41-
{{- range $reference := .metadata.references }}
42-
{{- if kindIs "map" $reference.commit }}
43-
Commit:
44-
{{- range $key, $value := $reference.commit }}
45-
{{- if eq $key "author" }}
46-
Co-authored-by: {{ $value }}
47-
{{- end }}
48-
{{- end }}
49-
{{- end }}
50-
{{- end }}
51-
{{- end }}
52-
{{- end }}`
53-
5420
func TestGetRepoObjs(t *testing.T) {
5521
cm := test.NewConfigMap()
5622
cm.SetAnnotations(map[string]string{
@@ -113,7 +79,7 @@ func TestGetRepoObjs(t *testing.T) {
11379
assert.Equal(t, "ConfigMap", objs[0].GetKind())
11480
}
11581

116-
func TestGetHydratorCommitMessageTemplate_WhenTemplateisNotDefined(t *testing.T) {
82+
func TestGetHydratorCommitMessageTemplate_WhenTemplateisNotDefined_FallbackToDefault(t *testing.T) {
11783
cm := test.NewConfigMap()
11884
cmBytes, _ := json.Marshal(cm)
11985

@@ -130,13 +96,13 @@ func TestGetHydratorCommitMessageTemplate_WhenTemplateisNotDefined(t *testing.T)
13096

13197
tmpl, err := ctrl.GetHydratorCommitMessageTemplate()
13298
require.NoError(t, err)
133-
assert.NotNil(t, tmpl)
134-
assert.Empty(t, tmpl)
99+
assert.NotEmpty(t, tmpl) // should fallback to default
100+
assert.Equal(t, settings.CommitMessageTemplate, tmpl)
135101
}
136102

137103
func TestGetHydratorCommitMessageTemplate(t *testing.T) {
138104
cm := test.NewFakeConfigMap()
139-
cm.Data["sourceHydrator.commitMessageTemplate"] = commitMessageTemplate
105+
cm.Data["sourceHydrator.commitMessageTemplate"] = settings.CommitMessageTemplate
140106
cmBytes, _ := json.Marshal(cm)
141107

142108
data := fakeData{
@@ -153,7 +119,5 @@ func TestGetHydratorCommitMessageTemplate(t *testing.T) {
153119

154120
tmpl, err := ctrl.GetHydratorCommitMessageTemplate()
155121
require.NoError(t, err)
156-
assert.NotNil(t, tmpl)
157122
assert.NotEmpty(t, tmpl)
158-
assert.Contains(t, tmpl, "Commit")
159123
}

0 commit comments

Comments
 (0)