DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: update

Browse source
This commit is contained in:
Tore S. Loenoey 2023-11-23 11:13:37 +01:00 committed by Tore Stendal Lønøy
parent 5f9d6f58a2
commit f352787d26
No known key found for this signature in database
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
internal/ingress/controller/template/template_test.go
View file

@ -408,9 +408,10 @@ func TestBuildProxyPassAutoHttp(t *testing.T) {
} }
func TestBuildAuthLocation(t *testing.T) { func TestBuildAuthLocation(t *testing.T) {
cfg := config.Configuration{}
invalidType := &ingress.Ingress{} invalidType := &ingress.Ingress{}
expected := "" expected := ""
actual := buildAuthLocation(invalidType, "") actual := buildAuthLocation(invalidType, "", cfg)
if !reflect.DeepEqual(expected, actual) { if !reflect.DeepEqual(expected, actual) {
t.Errorf("Expected '%v' but returned '%v'", expected, actual) t.Errorf("Expected '%v' but returned '%v'", expected, actual)
@ -451,7 +452,7 @@ func TestBuildAuthLocation(t *testing.T) {
loc.ExternalAuth.URL = testCase.authURL loc.ExternalAuth.URL = testCase.authURL
loc.EnableGlobalAuth = testCase.enableglobalExternalAuth loc.EnableGlobalAuth = testCase.enableglobalExternalAuth
str := buildAuthLocation(loc, testCase.globalAuthURL) str := buildAuthLocation(loc, testCase.globalAuthURL, cfg)
if str != testCase.expected { if str != testCase.expected {
t.Errorf("%v: expected '%v' but returned '%v'", testCase.title, testCase.expected, str) t.Errorf("%v: expected '%v' but returned '%v'", testCase.title, testCase.expected, str)
} }
@ -461,6 +462,7 @@ func TestBuildAuthLocation(t *testing.T) {
func TestShouldApplyGlobalAuth(t *testing.T) { func TestShouldApplyGlobalAuth(t *testing.T) {
authURL := fooAuthHost authURL := fooAuthHost
globalAuthURL := "foo.com/global-auth" globalAuthURL := "foo.com/global-auth"
cfg := config.Configuration{}
loc := &ingress.Location{ loc := &ingress.Location{
ExternalAuth: authreq.Config{ ExternalAuth: authreq.Config{
@ -491,7 +493,7 @@ func TestShouldApplyGlobalAuth(t *testing.T) {
loc.ExternalAuth.URL = testCase.authURL loc.ExternalAuth.URL = testCase.authURL
loc.EnableGlobalAuth = testCase.enableglobalExternalAuth loc.EnableGlobalAuth = testCase.enableglobalExternalAuth
result := shouldApplyGlobalAuth(loc, testCase.globalAuthURL) result := shouldApplyGlobalAuth(loc, testCase.globalAuthURL, cfg)
if result != testCase.expected { if result != testCase.expected {
t.Errorf("%v: expected '%v' but returned '%v'", testCase.title, testCase.expected, result) t.Errorf("%v: expected '%v' but returned '%v'", testCase.title, testCase.expected, result)
} }
@ -569,7 +571,8 @@ func TestBuildAuthProxySetHeaders(t *testing.T) {
func TestBuildAuthUpstreamName(t *testing.T) { func TestBuildAuthUpstreamName(t *testing.T) {
invalidType := &ingress.Ingress{} invalidType := &ingress.Ingress{}
expected := "" expected := ""
actual := buildAuthUpstreamName(invalidType, "") cfg := config.Configuration{}
actual := buildAuthUpstreamName(invalidType, "", cfg)
if !reflect.DeepEqual(expected, actual) { if !reflect.DeepEqual(expected, actual) {
t.Errorf("Expected '%v' but returned '%v'", expected, actual) t.Errorf("Expected '%v' but returned '%v'", expected, actual)
@ -596,7 +599,7 @@ func TestBuildAuthUpstreamName(t *testing.T) {
} }
for _, testCase := range testCases { for _, testCase := range testCases {
str := buildAuthUpstreamName(loc, testCase.host) str := buildAuthUpstreamName(loc, testCase.host, cfg)
if str != testCase.expected { if str != testCase.expected {
t.Errorf("%v: expected '%v' but returned '%v'", testCase.title, testCase.expected, str) t.Errorf("%v: expected '%v' but returned '%v'", testCase.title, testCase.expected, str)
} }