Merge pull request #2 from thierrymarianne/accept-valid-types

Accept valid types with trailing spaces
PrestaShop · Sep 15, 2016 · 808a505 · 808a505
2 parents 6b20a95 + 00361aa
commit 808a505
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/AppBundle/PullRequests/BodyParser.php b/src/AppBundle/PullRequests/BodyParser.php
@@ -45,7 +45,7 @@ public function getDescription()
      */
     public function getType()
     {
-        $regex = "/(\|[[:space:]]Type\?[[:space:]]+\|[[:space:]])(.+)\r\n/";
+        $regex = "/(\|[[:space:]]Type\?[[:space:]]+\|[[:space:]]*)(\S+\s?\S*)[[:space:]]*\r\n/";
 
         return $this->extractWithRegex($regex);
     }

diff --git a/tests/AppBundle/webhook_examples/pull_request_body.opened.json b/tests/AppBundle/webhook_examples/pull_request_body.opened.json
@@ -31,7 +31,7 @@
       "type": "User",
       "site_admin": false
     },
-    "body": "<!-- Thank you for contributing to the PrestaShop project! \r\n\r\nPlease take the time to edit the \"Answers\" rows with the necessary information:-->\r\n\r\n| Questions     | Answers\r\n| ------------- | -------------------------------------------------------\r\n| Branch?       | develop\r\n| Description?  | Such a great description\r\n| Type?         | new feature\r\n| Category?     | BO\r\n| BC breaks?    | no\r\n| Deprecations? | yes\r\n| Fixed ticket? | http://forge.prestashop.com/browse/TEST-1234\r\n| How to test?  | To test it, launch unit tests\r\n\r\n<!-- Click the form's \"Preview button\" to make sure the table is functional in GitHub. Thank you! -->\r\n\r\n#### Important guidelines\r\n\r\n* Make sure [your local branch is up to date](https://help.github.com/articles/syncing-a-fork/) before commiting your changes!\r\n* Your code MUST respect [our Coding Standards](http://doc.prestashop.com/display/PS16/Coding+Standards) (for code written in PHP, JavaScript, HTML/CSS/Smarty/Twig, SQL)!\r\n* Your commit name MUST respect our [naming convention](http://doc.prestashop.com/display/PS16/How+to+write+a+commit+message)!\r\n\r\n",
+    "body": "<!-- Thank you for contributing to the PrestaShop project! \r\n\r\nPlease take the time to edit the \"Answers\" rows with the necessary information:-->\r\n\r\n| Questions     | Answers\r\n| ------------- | -------------------------------------------------------\r\n| Branch?       | develop\r\n| Description?  | Such a great description\r\n| Type?         |  new feature \r\n| Category?     | BO\r\n| BC breaks?    | no\r\n| Deprecations? | yes\r\n| Fixed ticket? | http://forge.prestashop.com/browse/TEST-1234\r\n| How to test?  | To test it, launch unit tests\r\n\r\n<!-- Click the form's \"Preview button\" to make sure the table is functional in GitHub. Thank you! -->\r\n\r\n#### Important guidelines\r\n\r\n* Make sure [your local branch is up to date](https://help.github.com/articles/syncing-a-fork/) before commiting your changes!\r\n* Your code MUST respect [our Coding Standards](http://doc.prestashop.com/display/PS16/Coding+Standards) (for code written in PHP, JavaScript, HTML/CSS/Smarty/Twig, SQL)!\r\n* Your commit name MUST respect our [naming convention](http://doc.prestashop.com/display/PS16/How+to+write+a+commit+message)!\r\n\r\n",
     "created_at": "2015-06-28T15:20:57Z",
     "updated_at": "2015-06-28T15:20:57Z",
     "closed_at": null,