Added negative lookahead on regex to stop match at first quotation ma…

…rk so the match works inside an href link without whitespace around it
spira · Jul 29, 2015 · 588ba43 · 588ba43
1 parent c72bf6c
commit 588ba43
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/api/tests/integration/UserTest.php b/api/tests/integration/UserTest.php
@@ -279,8 +279,8 @@ public function testResetPasswordMail()
         // Extract the token from the message source
         $msg = $this->getLastMessage();
         $source = $this->getMessageSource($msg->id);
-        preg_match_all('!https?://\S+!', $source, $matches);
-        $tokenUrl = $matches[0][0];
+        preg_match_all('/https?:\/\/\S(?:(?![\'"]).)*/', $source, $matches);
+        $tokenUrl = trim($matches[0][0]);
         $parsed = parse_url($tokenUrl);
         $token = str_replace('passwordResetToken=', '', $parsed['query']);