rework formatting of ticket

rngadam · rngadam · commit e7e4526fa0dd · 2017-02-03T14:48:33.000+08:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -18,7 +18,7 @@ module.exports = {
         "brace-style": "error",
         "callback-return": "error",
         "camelcase": "error",
-        "capitalized-comments": "error",
+        "capitalized-comments": "off",
         "class-methods-use-this": "error",
         "comma-dangle": "off",
         "comma-spacing": [
diff --git a/support.js b/support.js
@@ -32,7 +32,7 @@ const actions = [
 },
 {
     action: (data, message, content) =>
-        ticket.openTicket(data.tickets, message, content),
+        ticket.openTicket(data.tickets, message, content.trim()),
     regexp: /please (.*)/i,
     reply: (message, output) => `will ${output.content} (ticket #${output.id})`,
 },
@@ -85,9 +85,9 @@ const actions = [
     reply: (message, output) => ticket.showTickets(output, ['open', 'closed']),
 },
 {
-    action: (data, _message) => ticket.forget(data.tickets),
-    regexp: /forget it/i,
-    reply: (message, output) => `deleted ${output} tickets`,
+    action: (data, _message, id) => ticket.forgetTicket(data.tickets, id),
+    regexp: /forget #?([0-9]*)/i,
+    reply: (message, output) => `deleted ticket #${output}`,
 },
 {
     action: (_data, _message, _type) => true,
diff --git a/test/support_test.js b/test/support_test.js
@@ -104,9 +104,9 @@ describe('support', function() {
 
     it('forget it', function() {
         const data = oneTicket()
-        const reply = support.process(data, message('forget it'))
-        assert.equal(reply, '#cando: deleted 1 tickets')
-        assert.equal(data.tickets.lastId, 0)
+        const reply = support.process(data, message('forget #1'))
+        assert.equal(reply, '#cando: deleted ticket #1')
+        assert.equal(data.tickets.lastId, 1)
     })
 
     it('gimme a compliment', function() {
@@ -145,19 +145,19 @@ describe('support', function() {
 
     it('TODO with ticket specific mine', function() {
         const reply = support.process(twoTickets(), message('mine'))
-        assert.match(reply, /ticket #1/)
-        assert.notMatch(reply, /ticket #2/)
+        assert.match(reply, /#1: Ricky/)
+        assert.notMatch(reply, /#2/)
     })
 
     it('TODO with ticket specific other user', function() {
         const reply = support.process(twoTickets(), message('TODO dmitry'))
-        assert.notMatch(reply, /ticket #1/)
-        assert.match(reply, /ticket #2/)
+        assert.notMatch(reply, /#1/)
+        assert.match(reply, /#2/)
     })
 
     it('Add comment to ticket', function() {
         const reply = support.process(oneTicket(), message('ticket #1 do not forget to get different colors'))
-        assert.match(reply, /ticket #1/)
+        assert.match(reply, /#1/)
         assert.match(reply, /do not forget to get different colors/)
     })
 
