rules: allow GitHub URLs containing hyphens

GitHub user and organization names and repository names can contain
hyphen characters which are not included in the `\w` regular
expression character class.

Author: richardlau

lib/rules/fixes-url.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const id = 'fixes-url'
-const github = new RegExp('^https://github\.com/\\w+\/\\w+/' +
+const github = new RegExp('^https://github\.com/[\\w-]+\/[\\w-]+/' +
   '(issues|pull)/\\d+(#issuecomment-\\d+|#discussion_r\\d+)?$'
 )
 

lib/rules/pr-url.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const id = 'pr-url'
-const prUrl = /^https:\/\/github\.com\/\w+\/\w+\/pull\/\d+$/
+const prUrl = /^https:\/\/github\.com\/[\w-]+\/[\w-]+\/pull\/\d+$/
 
 module.exports = {
   id: id

test/rules/fixes-url.js

@@ -26,8 +26,16 @@ test('rule: fixes-url', (t) => {
   const valid = [
     [ 'GitHub issue URL'
     , 'https://github.com/nodejs/node/issues/1234' ]
+  , [ 'GitHub issue URL containing hyphen'
+    , 'https://github.com/nodejs/node-report/issues/1234' ]
+  , [ 'GitHub issue URL containing hyphen with comment'
+    , 'https://github.com/nodejs/node-report/issues/1234#issuecomment-1234' ]
   , [ 'GitHub issue URL with comment'
     , 'https://github.com/nodejs/node/issues/1234#issuecomment-1234' ]
+  , [ 'GitHub PR URL containing hyphen with comment'
+    , 'https://github.com/nodejs/node-report/pull/1234#issuecomment-1234' ]
+  , [ 'GitHub PR URL containing hyphen with discussion comment'
+    , 'https://github.com/nodejs/node-report/pull/1234#discussion_r1234' ]
   , [ 'GitHub PR URL with comment'
     , 'https://github.com/nodejs/node/pull/1234#issuecomment-1234' ]
   , [ 'GitHub PR URL with discussion comment'
@@ -61,6 +69,8 @@ Fixes: ${url}`
     , '#1234' ]
   , [ 'GitHub PR URL', INVALID_PRURL
     , 'https://github.com/nodejs/node/pull/1234' ]
+  , [ 'GitHub PR URL containing hyphen', INVALID_PRURL
+    , 'https://github.com/nodejs/node-report/pull/1234' ]
   , [ 'non-GitHub URL', NOT_A_GITHUB_URL
     , 'https://nodejs.org' ]
   , [ 'not a URL or issue number', NOT_A_GITHUB_URL

test/rules/pr-url.js

@@ -95,5 +95,28 @@ test('rule: pr-url', (t) => {
     Rule.validate(context)
   })
 
+  t.test('valid URL containing hyphen', (tt) => {
+    tt.plan(7)
+    const url = 'https://github.com/nodejs/node-report/pull/1234'
+    const context = {
+      prUrl: url
+    , body: [
+        ''
+      , `PR-URL: ${url}`
+      ]
+    , report: (opts) => {
+        tt.pass('called report')
+        tt.equal(opts.id, 'pr-url', 'id')
+        tt.equal(opts.message, VALID_PR_URL, 'message')
+        tt.equal(opts.string, url, 'string')
+        tt.equal(opts.line, 1, 'line')
+        tt.equal(opts.column, 8, 'column')
+        tt.equal(opts.level, 'pass', 'level')
+      }
+    }
+
+    Rule.validate(context)
+  })
+
   t.end()
 })