match step expected content after replacing actual data

driver/groupdriver.go

@@ -13,13 +13,9 @@ type Step struct {
 }
 
 func (s *Step) MatchesExpectedContent(content []byte) (bool, error) {
-	pattern := `.*\?.*|.*`
+	pattern := regexp.QuoteMeta(s.ExpectedContent)
-	re, err := regexp.Compile(pattern)
+	re, _ := regexp.Compile(pattern)
-	if err != nil {
+	if re.Match([]byte(content)) {
-		return false, err
-	}
-	// Check if the content matches the regex pattern
-	if re.Match(content) {
 		return true, nil
 	}
 	return false, nil
@@ -38,7 +34,8 @@ type TestCase struct {
 }
 
 func (s *TestCase) MatchesExpectedContent(content []byte) (bool, error) {
-	re, err := regexp.Compile(s.ExpectedContent)
+	pattern := regexp.QuoteMeta(s.ExpectedContent)
+	re, err := regexp.Compile(pattern)
 	if err != nil {
 		return false, err
 	}

test_engine/menu_traversal_test.go

@@ -160,6 +160,7 @@ func TestSendWithInvalidInputs(t *testing.T) {
 
 				// Replace placeholder {public_key} with the actual dynamic public key
 				expectedContent := bytes.Replace([]byte(step.ExpectedContent), []byte("{public_key}"), []byte(publicKey), -1)
+				step.ExpectedContent = string(expectedContent)
 				match, err := step.MatchesExpectedContent(b)
 				if err != nil {
 					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
@@ -338,6 +339,7 @@ func TestMyAccount_MyAddress(t *testing.T) {
 
 				publicKey := extractPublicKey(b)
 				expectedContent := bytes.Replace([]byte(step.ExpectedContent), []byte("{public_key}"), []byte(publicKey), -1)
+				step.ExpectedContent = string(expectedContent)
 				match, err := step.MatchesExpectedContent(b)
 				if err != nil {
 					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)