Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make pager trigger unicode compatible #116

Merged
merged 2 commits into from
Nov 17, 2018
Merged

Make pager trigger unicode compatible #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a38ba92
Problem: Pager Trigger's regex isn't matching the quoted portion due …
Nov 17, 2018
4c5d670
Update tests
Nov 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/scripts/pagerduty.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,15 @@ module.exports = (robot) ->

robot.respond /(pager|major)( me)? (?:trigger|page) ([\w\-]+)$/i, (msg) ->
msg.reply "Please include a user or schedule to page, like 'hubot pager infrastructure everything is on fire'."

robot.respond /(pager|major)( me)? (?:trigger|page) ((["'])([^]*?)\4|([\.\w\-]+)) (.+)$/i, (msg) ->
robot.respond /(pager|major)( me)? (?:trigger|page) ((["'])([^\4]*?)\4|“([^”]*?)”|‘([^’]*?)’|([\.\w\-]+)) (.+)$/i, (msg) ->
msg.finish()

if pagerduty.missingEnvironmentForApi(msg)
return

fromUserName = msg.message.user.name
query = msg.match[5] or msg.match[6]
reason = msg.match[7]
query = msg.match[5] or msg.match[6] or msg.match[7] or msg.match[8]
reason = msg.match[9]
description = "#{reason} - @#{fromUserName}"

# Figure out who we are
Expand Down
14 changes: 7 additions & 7 deletions test/pager-me-test.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ expect = chai.expect

describe 'pagerduty', ->
before ->
@triggerRegex = /(pager|major)( me)? (?:trigger|page) ((["'])([^]*?)\4|([\.\w\-]+)) (.+)$/i
@triggerRegex = /(pager|major)( me)? (?:trigger|page) ((["'])([^\4]*?)\4|“([^”]*?)”|‘([^’]*?)’|([\.\w\-]+)) (.+)$/i
@schedulesRegex = /(pager|major)( me)? schedules( ((["'])([^]*?)\5|(.+)))?$/i
@whosOnCallRegex = /who(?:’s|'s|s| is|se)? (?:on call|oncall|on-call)(?:\?)?(?: (?:for )?((["'])([^]*?)\2|(.*?))(?:\?|$))?$/i

Expand Down Expand Up @@ -82,23 +82,23 @@ describe 'pagerduty', ->

it 'trigger handles users with dots', ->
msg = @triggerRegex.exec('pager trigger foo.bar baz')
expect(msg[6]).to.equal('foo.bar')
expect(msg[7]).to.equal('baz')
expect(msg[8]).to.equal('foo.bar')
expect(msg[9]).to.equal('baz')

it 'trigger handles users with spaces', ->
msg = @triggerRegex.exec('pager trigger "foo bar" baz')
expect(msg[5]).to.equal('foo bar')
expect(msg[7]).to.equal('baz')
expect(msg[9]).to.equal('baz')

it 'trigger handles users with spaces and single quotes', ->
msg = @triggerRegex.exec("pager trigger 'foo bar' baz")
expect(msg[5]).to.equal('foo bar')
expect(msg[7]).to.equal('baz')
expect(msg[9]).to.equal('baz')

it 'trigger handles users without spaces', ->
msg = @triggerRegex.exec('pager trigger foo bar baz')
expect(msg[6]).to.equal('foo')
expect(msg[7]).to.equal('bar baz')
expect(msg[8]).to.equal('foo')
expect(msg[9]).to.equal('bar baz')

it 'schedules handles names with quotes', ->
msg = @schedulesRegex.exec('pager schedules "foo bar"')
Expand Down