Fix matching score bug for body matcher

SpectoLabs · Feb 28, 2024 · d4bca67 · d4bca67
1 parent b4b6e0d
commit d4bca67
Show file tree

Hide file tree

Showing 3 changed files with 187 additions and 58 deletions.
diff --git a/core/matching/body_formdata_matching.go b/core/matching/body_formdata_matching.go
@@ -11,10 +11,7 @@ func BodyMatching(fields []models.RequestFieldMatchers, req models.RequestDetail
 	var score int
 
 	if len(fields) == 0 {
-		return &FieldMatch{
-			Matched: matched,
-			Score:   1,
-		}
+		return &FieldMatch{Matched: true}
 	}
 
 	for _, field := range fields {

diff --git a/core/matching/first_match_strategy_test.go b/core/matching/first_match_strategy_test.go
@@ -10,18 +10,16 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var testResponse = models.ResponseDetails{
-	Body: "request matched",
-}
-
 func Test_FirstMatchStrategy_EmptyRequestMatchersShouldMatchOnAnyRequest(t *testing.T) {
 	RegisterTestingT(t)
 
 	simulation := models.NewSimulation()
 
 	simulation.AddPair(&models.RequestMatcherResponsePair{
 		RequestMatcher: models.RequestMatcher{},
-		Response:       testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{
@@ -50,7 +48,9 @@ func Test_FirstMatchStrategy_RequestMatchersShouldMatchOnBody(t *testing.T) {
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{
@@ -86,7 +86,9 @@ func Test_FirstMatchStrategy_ReturnResponseWhenAllHeadersMatch(t *testing.T) {
 		RequestMatcher: models.RequestMatcher{
 			Headers: headers,
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{
@@ -127,7 +129,9 @@ func Test_FirstMatchStrategy_ReturnNilWhenOneHeaderNotPresentInRequest(t *testin
 		RequestMatcher: models.RequestMatcher{
 			Headers: headers,
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{
@@ -167,7 +171,9 @@ func Test_FirstMatchStrategy_ReturnNilWhenOneHeaderValueDifferent(t *testing.T)
 		RequestMatcher: models.RequestMatcher{
 			Headers: headers,
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{
@@ -207,7 +213,9 @@ func Test_FirstMatchStrategy_ReturnResponseWithMultiValuedHeaderMatch(t *testing
 		RequestMatcher: models.RequestMatcher{
 			Headers: headers,
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{
@@ -248,7 +256,9 @@ func Test_FirstMatchStrategy_ReturnNilWithDifferentMultiValuedHeaders(t *testing
 		RequestMatcher: models.RequestMatcher{
 			Headers: headers,
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{
@@ -307,7 +317,9 @@ func Test_FirstMatchStrategy_EndpointMatchWithHeaders(t *testing.T) {
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{
@@ -369,7 +381,9 @@ func Test_FirstMatchStrategy_EndpointMismatchWithHeadersReturnsNil(t *testing.T)
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{
@@ -416,7 +430,9 @@ func Test_FirstMatchStrategy_AbleToMatchAnEmptyPathInAReasonableWay(t *testing.T
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{
@@ -456,7 +472,9 @@ func Test_FirstMatchStrategy_RequestMatcherResponsePairCanBeConvertedToARequestR
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	}
 
 	pairView := requestMatcherResponsePair.BuildView()
@@ -487,7 +505,9 @@ func Test_FirstMatchStrategy_RequestMatchersCanUseGlobsAndBeMatched(t *testing.T
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	request := models.RequestDetails{
@@ -516,7 +536,9 @@ func Test_FirstMatchStrategy_RequestMatchersCanUseGlobsOnSchemeAndBeMatched(t *t
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	request := models.RequestDetails{
@@ -548,7 +570,9 @@ func Test_FirstMatchStrategy_RequestMatchersCanUseGlobsOnHeadersAndBeMatched(t *
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	request := models.RequestDetails{
@@ -578,7 +602,9 @@ func Test_FirstMatchStrategy_RequestMatcherResponsePair_ConvertToRequestResponse
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	}
 
 	pairView := requestMatcherResponsePair.BuildView()
@@ -640,7 +666,9 @@ func Test_FirstMatchShouldNotBeCacheableIfMatchedOnEverythingApartFromHeadersAtL
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	simulation.AddPair(&models.RequestMatcherResponsePair{
@@ -652,7 +680,9 @@ func Test_FirstMatchShouldNotBeCacheableIfMatchedOnEverythingApartFromHeadersAtL
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{
@@ -729,7 +759,9 @@ func Test_FirstMatchShouldBeCacheableIfMatchedOnEverythingApartFromHeadersZeroTi
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	simulation.AddPair(&models.RequestMatcherResponsePair{
@@ -741,7 +773,9 @@ func Test_FirstMatchShouldBeCacheableIfMatchedOnEverythingApartFromHeadersZeroTi
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{
@@ -849,7 +883,9 @@ func Test_FirstMatchStrategy_RequestMatchersShouldMatchOnStateAndNotBeCacheable(
 		RequestMatcher: models.RequestMatcher{
 			RequiresState: map[string]string{"key1": "value1", "key2": "value2"},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{
@@ -909,7 +945,9 @@ func Test_FirstMatchShouldNotBeCacheableIfMatchedOnEverythingApartFromStateAtLea
 				"foo": "bar",
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	simulation.AddPair(&models.RequestMatcherResponsePair{
@@ -921,7 +959,9 @@ func Test_FirstMatchShouldNotBeCacheableIfMatchedOnEverythingApartFromStateAtLea
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{
@@ -990,7 +1030,9 @@ func Test_FirstMatchShouldBeCacheableIfMatchedOnEverythingApartFromStateZeroTime
 				"foo": "bar",
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	simulation.AddPair(&models.RequestMatcherResponsePair{
@@ -1002,7 +1044,9 @@ func Test_FirstMatchShouldBeCacheableIfMatchedOnEverythingApartFromStateZeroTime
 				},
 			},
 		},
-		Response: testResponse,
+		Response: models.ResponseDetails{
+			Body: "request matched",
+		},
 	})
 
 	r := models.RequestDetails{