Adjust gatewayTags tests to account for ShouldOmit

TykTechnologies · Jun 15, 2022 · 9c0a1df · 9c0a1df
1 parent 493ec32
commit 9c0a1df
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/apidef/oas/oas_test.go b/apidef/oas/oas_test.go
@@ -35,6 +35,7 @@ func TestOAS(t *testing.T) {
 		t.Parallel()
 
 		var nilOASPaths OAS
+		nilOASPaths.SetTykExtension(&XTykAPIGateway{})
 
 		var convertedAPI apidef.APIDefinition
 		nilOASPaths.ExtractTo(&convertedAPI)
@@ -44,6 +45,7 @@ func TestOAS(t *testing.T) {
 
 		// No paths in base OAS produce empty paths{} when converted back
 		nilOASPaths.Paths = make(openapi3.Paths)
+		nilOASPaths.Extensions = nil
 		assert.Equal(t, nilOASPaths, resultOAS)
 	})
 

diff --git a/apidef/oas/server.go b/apidef/oas/server.go
@@ -42,7 +42,7 @@ func (s *Server) Fill(api apidef.APIDefinition) {
 		s.GatewayTags = &GatewayTags{}
 	}
 	s.GatewayTags.Fill(api)
-	if len(s.GatewayTags.Tags) == 0 {
+	if ShouldOmit(s.GatewayTags) {
 		s.GatewayTags = nil
 	}
 

diff --git a/apidef/oas/server_test.go b/apidef/oas/server_test.go
@@ -51,13 +51,11 @@ func TestGatewayTags(t *testing.T) {
 		},
 		{
 			input: GatewayTags{Enabled: true},
-			want:  GatewayTags{},
-			omit:  true,
+			want:  GatewayTags{Enabled: true},
 		},
 		{
 			input: GatewayTags{Enabled: true, Tags: []string{}},
-			want:  GatewayTags{},
-			omit:  true,
+			want:  GatewayTags{Enabled: true, Tags: []string{}},
 		},
 		{
 			input: GatewayTags{Enabled: true, Tags: []string{"test"}},
@@ -281,12 +279,17 @@ func TestTagsExportServer(t *testing.T) {
 				TagsDisabled: true,
 				Tags:         []string{"a", "b", "c"},
 			},
-			nil,
+			&GatewayTags{
+				Enabled: false,
+				Tags:    []string{"a", "b", "c"},
+			},
 		},
 		{
 			"empty segment tags",
 			apidef.APIDefinition{},
-			nil,
+			&GatewayTags{
+				Enabled: true,
+			},
 		},
 	}