From 50c0c12c5713744e58f7a0f26b52a9186cda9386 Mon Sep 17 00:00:00 2001
From: snewcomer24 <snewcomer24@gmail.com>
Date: Wed, 27 Dec 2017 12:43:27 -0800
Subject: [PATCH] Sort converation parts by insertedAt:asc

---
 .../conversations/conversation-thread.hbs          |  2 +-
 .../conversations/conversation-thread-test.js      | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/templates/components/conversations/conversation-thread.hbs b/app/templates/components/conversations/conversation-thread.hbs
index 9461ddffd..d9f790e9a 100644
--- a/app/templates/components/conversations/conversation-thread.hbs
+++ b/app/templates/components/conversations/conversation-thread.hbs
@@ -8,7 +8,7 @@
         sentAt=conversation.message.insertedAt
       }}
     {{/if}}
-    {{#each conversation.conversationParts as |conversationPart|}}
+    {{#each (sort-by "insertedAt:asc" conversation.conversationParts) as |conversationPart|}}
       {{#if conversationPart.isLoaded}}
         {{conversations/conversation-part
           author=conversationPart.author
diff --git a/tests/integration/components/conversations/conversation-thread-test.js b/tests/integration/components/conversations/conversation-thread-test.js
index 8ee47602c..636fc30fc 100644
--- a/tests/integration/components/conversations/conversation-thread-test.js
+++ b/tests/integration/components/conversations/conversation-thread-test.js
@@ -60,21 +60,21 @@ test('it delays rendering head until loaded', function(assert) {
   assert.equal(page.conversationParts().count, 0, 'No part is rendered.');
 });
 
-test('it renders each conversation part', function(assert) {
+test('it renders each conversation part, sorted by insertedAt', function(assert) {
   assert.expect(4);
 
   let conversationParts = [
-    { isLoaded: true, body: 'foo 1' },
-    { isLoaded: true, body: 'foo 2' },
-    { isLoaded: true, body: 'foo 3' }
+    { isLoaded: true, body: 'foo 1', insertedAt: new Date('2017-11-01') },
+    { isLoaded: true, body: 'foo 2', insertedAt: new Date('2017-12-01') },
+    { isLoaded: true, body: 'foo 3', insertedAt: new Date('2017-10-01') }
   ];
   set(this, 'conversation', { conversationParts });
   renderPage();
 
   assert.equal(page.conversationParts().count, 3, 'Each part is rendered.');
-  assert.equal(page.conversationParts(0).body.text, 'foo 1', 'Part 1 is rendered correctly.');
-  assert.equal(page.conversationParts(1).body.text, 'foo 2', 'Part 2 is rendered correctly.');
-  assert.equal(page.conversationParts(2).body.text, 'foo 3', 'Part 3 is rendered correctly.');
+  assert.equal(page.conversationParts(1).body.text, 'foo 1', 'Part 1 is rendered second to last.');
+  assert.equal(page.conversationParts(2).body.text, 'foo 2', 'Part 2 is rendered last (newest).');
+  assert.equal(page.conversationParts(0).body.text, 'foo 3', 'Part 3 is rendered first (earliest date).');
 });
 
 test('it delays rendering conversation parts not yet loaded', function(assert) {