From 141619c3f5efb6081b7d69da0111c73ea2a94ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20=C5=A0im=C3=A1nek?= <josef.simanek@gmail.com>
Date: Fri, 9 May 2014 03:30:10 +0200
Subject: [PATCH] Show committer in build header only when he's not author.

---
 assets/scripts/app/models/commit.coffee      |  5 +++
 assets/scripts/app/templates/builds/show.hbs | 10 +++--
 assets/scripts/spec/unit/commit_spec.coffee  | 39 ++++++++++++++++++++
 3 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 assets/scripts/spec/unit/commit_spec.coffee

diff --git a/assets/scripts/app/models/commit.coffee b/assets/scripts/app/models/commit.coffee
index b51f1a96..e654af68 100644
--- a/assets/scripts/app/models/commit.coffee
+++ b/assets/scripts/app/models/commit.coffee
@@ -26,3 +26,8 @@ require 'travis/model'
     else
       ""
   ).property('message')
+
+  authorIsCommitter: ( ->
+    @get('authorName') == @get('committerName') and
+      @get('authorEmail') == @get('committerEmail')
+  ).property('authorName', 'authorEmail', 'committerName', 'committerEmail')
diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs
index 2062cfa7..1492f227 100644
--- a/assets/scripts/app/templates/builds/show.hbs
+++ b/assets/scripts/app/templates/builds/show.hbs
@@ -31,11 +31,13 @@
     <div class="footer">
       <div class="author">
         {{#if commit.authorName}}
-          <div class="authored"><img {{bind-attr src="view.urlAuthorGravatarImage"}}/>{{commit.authorName}} authored</div>
-        {{/if}}
-        {{#if commit.committerName}}
-          <div class="committed"><img {{bind-attr src="view.urlCommitterGravatarImage"}}/>{{commit.committerName}} committed</div>
+          <div class="authored"><img {{bind-attr src="view.urlAuthorGravatarImage"}}/>{{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}}</div>
         {{/if}}
+        {{#unless commit.authorIsCommitter}}
+          {{#if commit.committerName}}
+            <div class="committed"><img {{bind-attr src="view.urlCommitterGravatarImage"}}/>{{commit.committerName}} committed</div>
+          {{/if}}
+        {{/unless}}
       </div>
 
       <div class="commit-changes">
diff --git a/assets/scripts/spec/unit/commit_spec.coffee b/assets/scripts/spec/unit/commit_spec.coffee
new file mode 100644
index 00000000..799b6ca7
--- /dev/null
+++ b/assets/scripts/spec/unit/commit_spec.coffee
@@ -0,0 +1,39 @@
+record = null
+
+module "Travis.Commit",
+  setup: ->
+  teardown: ->
+    Travis.Commit.resetData()
+
+test 'it recognizes when author is committer', ->
+  Travis.Commit.load [
+    {
+      id: 1,
+      committer_name: 'Jimmy',
+      committer_email: 'jimmy@example.com',
+      author_name: 'Jimmy',
+      author_email: 'jimmy@example.com'
+    }
+  ]
+
+  Ember.run ->
+    record = Travis.Commit.find 1
+
+    console.log(record.get('authorName'))
+    equal(true, record.get('authorIsCommitter'))
+
+test 'it recognizes when author is not committer', ->
+  Travis.Commit.load [
+    {
+      id: 1,
+      committer_name: 'Jimmy',
+      committer_email: 'jimmy@example.com',
+      author_name: 'John',
+      author_email: 'john@example.com'
+    }
+  ]
+
+  Ember.run ->
+    record = Travis.Commit.find 1
+    console.log(record.get('authorName'))
+    equal(false, record.get('authorIsCommitter'))