mimic "<actor> <action>" summaries used in PushHelper

brynary · Oct 26, 2011 · 409ed1a · 409ed1a
1 parent 8ab8c68
commit 409ed1a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/events/issue_helpers.rb b/lib/events/issue_helpers.rb
@@ -11,11 +11,11 @@ def summary_url
   end
 
   def summary_message
-    "[%s] Issue #%d: %s - @%s. %s" % [
+    "[%s] %s opened issue #%d: %s. %s" % [
       repo.name,
+      issue.user.login,
       issue.number,
       issue.title,
-      issue.user.login,
       issue.html_url]
   rescue
     raise_config_error "Unable to build message: #{$!.to_s}"

diff --git a/lib/events/pull_request_helpers.rb b/lib/events/pull_request_helpers.rb
@@ -11,12 +11,12 @@ def summary_url
   end
 
   def summary_message
-    "[%s] Pull Request #%d (%s -> %s): %s - @%s. %s" % [
+    "[%s] %s opened pull request #%d (%s -> %s): %s. %s" % [
       repo.name,
+      pull.user.login,
       pull.number,
       pull.base.label.split(':').last, pull.head.label,
       pull.title,
-      pull.user.login,
       pull.html_url]
   rescue
     raise_config_error "Unable to build message: #{$!.to_s}"

diff --git a/test/campfire_test.rb b/test/campfire_test.rb
@@ -51,7 +51,7 @@ def test_issues
     assert_equal 't', svc.campfire.token
     assert_equal 'r', svc.campfire.rooms.first.name
     assert_equal 1, svc.campfire.rooms.first.lines.size # 3 + summary
-    assert_match /\[grit\] Issue #5: booya - @mojombo/i, svc.campfire.rooms.first.lines.first
+    assert_match /\[grit\] mojombo opened issue #5: booya./i, svc.campfire.rooms.first.lines.first
   end
 
   def test_pull
@@ -62,7 +62,7 @@ def test_pull
     assert_equal 't', svc.campfire.token
     assert_equal 'r', svc.campfire.rooms.first.name
     assert_equal 1, svc.campfire.rooms.first.lines.size # 3 + summary
-    assert_match /\[grit\] Pull Request #5 \(master -> foo:feature\): booya - @mojombo./i, svc.campfire.rooms.first.lines.first
+    assert_match /\[grit\] mojombo opened pull request #5 \(master -> foo:feature\): booya./i, svc.campfire.rooms.first.lines.first
   end
 
   def test_full_domain