From 4da4fa6c84f999a57f93cd34645ce9a7499eaf2c Mon Sep 17 00:00:00 2001 From: Flohw Date: Mon, 7 Feb 2022 13:41:51 +0100 Subject: [PATCH 1/2] Normalized test name matches int and string indexed data provider --- src/Browser/Test/BrowserExtension.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Browser/Test/BrowserExtension.php b/src/Browser/Test/BrowserExtension.php index 8dadf46..17a06db 100644 --- a/src/Browser/Test/BrowserExtension.php +++ b/src/Browser/Test/BrowserExtension.php @@ -108,12 +108,15 @@ private static function dumpBrowsers(string $test, string $type): void private static function normalizeTestName(string $name): string { - \preg_match('#^([\w:\\\]+)(.+\#(\d+).+)?$#', $name, $matches); + // Try to match for a numeric data set index. If it didn't, match for a string one. + if (!\preg_match('#^([\w:\\\]+)(.+\#(\d+).+)?$#', $name, $matches)) { + \preg_match('#^([\w:\\\]+)(.+"([\w ]+)".+)?$#', $name, $matches); + } $normalized = \strtr($matches[1], '\\:', '-_'); if (isset($matches[3])) { - $normalized .= '__data-set-'.$matches[3]; + $normalized .= '__data-set-'.strtr($matches[3], '\\: ', '-_-'); } return $normalized; From 35ba6f106882e44903dcdf49e7067c6d6a7628c4 Mon Sep 17 00:00:00 2001 From: Flohw Date: Mon, 7 Feb 2022 13:47:15 +0100 Subject: [PATCH 2/2] PHPCS on strtr --- src/Browser/Test/BrowserExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Browser/Test/BrowserExtension.php b/src/Browser/Test/BrowserExtension.php index 17a06db..1cdf88a 100644 --- a/src/Browser/Test/BrowserExtension.php +++ b/src/Browser/Test/BrowserExtension.php @@ -116,7 +116,7 @@ private static function normalizeTestName(string $name): string $normalized = \strtr($matches[1], '\\:', '-_'); if (isset($matches[3])) { - $normalized .= '__data-set-'.strtr($matches[3], '\\: ', '-_-'); + $normalized .= '__data-set-'.\strtr($matches[3], '\\: ', '-_-'); } return $normalized;