suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not githubify sign-off messages

Browse Source 
Don't successfully `githubify` strings prepended with an `@` symbol if
what's matched actually resembles an email address. @mentions should
only be githubified if there is a word boundary before it.

This fixes travis-ci/travis-ci#1591

Signed-off-by: David Celis <me@davidcel.is>
This commit is contained in:
David Celis 2013-12-10 12:34:37 -08:00
parent 7974341d77
commit aeebe85308
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/scripts/app/helpers/helpers.coffee
View File

@ -84,7 +84,7 @@ require 'config/emoij'
_githubReferenceRegexp: new RegExp("([\\w-]+)?\\/?([\\w-]+)?(?:#|gh-)(\\d+)", 'g') _githubReferenceRegexp: new RegExp("([\\w-]+)?\\/?([\\w-]+)?(?:#|gh-)(\\d+)", 'g')
_githubUserRegexp: new RegExp("@([\\w-]+)", 'g') _githubUserRegexp: new RegExp("^|\\B@([\\w-]+)", 'g')
_githubUserLink: (reference, username) -> _githubUserLink: (reference, username) ->
"<a href=\"http://github.com/#{username}\">#{reference}</a>" "<a href=\"http://github.com/#{username}\">#{reference}</a>"

6
assets/scripts/spec/unit/helpers_spec.coffee
View File

@ -52,3 +52,9 @@ test 'replaces @user with github user link', ->
expected = 'It is for you <a href="http://github.com/tender_love1">@tender_love1</a>' expected = 'It is for you <a href="http://github.com/tender_love1">@tender_love1</a>'
equal(result, expected, "@user should be converted to a link") equal(result, expected, "@user should be converted to a link")
test 'does not replace @user if it is a sign-off', ->
message = 'Signed-off-by: GitHub User <user@example.com>'
result = Travis.Helpers.githubify(message, 'travis-ci', 'travis-web')
equal(result, message, "@user should not be converted to a link if it matches an email")