Sort conversations by updatedAt timestamp (#1643)

* Sort conversations by updatedAt timestamp
* Expand existing acceptance test to cover ordering and timestamp formatting

Author: joshsmith

app/templates/conversations.hbs

@@ -2,7 +2,7 @@
 
 <div class="conversations">
   <aside>
-    {{#each conversations as |conversation|}}
+    {{#each (sort-by "updatedAt:desc" conversations) as |conversation|}}
       {{conversations/conversation-list-item-with-project
         conversation=conversation
       }}

app/templates/project/conversations.hbs

@@ -8,7 +8,7 @@
 
 <div class="conversations">
   <aside>
-    {{#each conversations as |conversation|}}
+    {{#each (sort-by "updatedAt:desc" conversations) as |conversation|}}
       {{conversations/conversation-list-item-with-user
         conversation=conversation
         close=(action 'close')

tests/acceptance/project-conversations-test.js

@@ -4,6 +4,8 @@ import moduleForAcceptance from 'code-corps-ember/tests/helpers/module-for-accep
 import { authenticateSession } from 'code-corps-ember/tests/helpers/ember-simple-auth';
 import page from 'code-corps-ember/tests/pages/project/conversations';
 
+const hour = 3600 * 1000;
+
 function createConversations(count, project, user) {
   return [...Array(count)].map(() => {
     let message = server.create('message', { project });
@@ -45,12 +47,22 @@ test('Page requires current user to be admin', function(assert) {
 });
 
 test('Project admin can view list of conversations', function(assert) {
-  assert.expect(1);
+  assert.expect(2);
 
   let { project, user } = server.create('project-user', { role: 'admin' });
   authenticateSession(this.application, { user_id: user.id });
 
-  createConversations(3, project, user);
+  let [message1, message2, message3] = server.createList('message', 3, { project });
+
+  let [date1, date2, date3] = [
+    Date.now(),
+    Date.now() - 5 * hour,
+    Date.now() - 1 * hour
+  ];
+
+  server.create('conversation', { message:  message1, user, updatedAt: date1 });
+  server.create('conversation', { message:  message2, user, updatedAt: date2 });
+  server.create('conversation', { message:  message3, user, updatedAt: date3 });
 
   page.visit({
     organization: project.organization.slug,
@@ -59,6 +71,23 @@ test('Project admin can view list of conversations', function(assert) {
 
   andThen(() => {
     assert.equal(page.conversations().count, 3, 'Conversations are rendered');
+    let renderedTimeStampOrder = [
+      page.conversations(0).updatedAt.text,
+      page.conversations(1).updatedAt.text,
+      page.conversations(2).updatedAt.text
+    ];
+
+    let expectedTimeStampOrder = [
+      'a few seconds ago',
+      'an hour ago',
+      '5 hours ago'
+    ];
+
+    assert.deepEqual(
+      renderedTimeStampOrder,
+      expectedTimeStampOrder,
+      'Items are rendered in correct order with properly formatted timestamps.'
+    );
   });
 });
 

tests/acceptance/user-conversations-test.js

@@ -4,6 +4,8 @@ import moduleForAcceptance from 'code-corps-ember/tests/helpers/module-for-accep
 import { authenticateSession } from 'code-corps-ember/tests/helpers/ember-simple-auth';
 import page from 'code-corps-ember/tests/pages/conversations';
 
+const hour = 3600 * 1000;
+
 moduleForAcceptance('Acceptance | User Conversations');
 
 test('Page requires authentication', function(assert) {
@@ -17,17 +19,42 @@ test('Page requires authentication', function(assert) {
 });
 
 test('User can view list of their own conversations', function(assert) {
-  assert.expect(1);
+  assert.expect(2);
 
   let user = server.create('user');
   authenticateSession(this.application, { user_id: user.id });
 
-  server.createList('conversation', 3, { user });
+  let [date1, date2, date3] = [
+    Date.now(),
+    Date.now() - 5 * hour,
+    Date.now() - 1 * hour
+  ];
+
+  server.create('conversation', { user, updatedAt: date1 });
+  server.create('conversation', { user, updatedAt: date2 });
+  server.create('conversation', { user, updatedAt: date3 });
 
   page.visit();
 
   andThen(() => {
     assert.equal(page.conversations().count, 3, 'Conversations are rendered');
+    let renderedTimeStampOrder = [
+      page.conversations(0).updatedAt.text,
+      page.conversations(1).updatedAt.text,
+      page.conversations(2).updatedAt.text
+    ];
+
+    let expectedTimeStampOrder = [
+      'a few seconds ago',
+      'an hour ago',
+      '5 hours ago'
+    ];
+
+    assert.deepEqual(
+      renderedTimeStampOrder,
+      expectedTimeStampOrder,
+      'Items are rendered in correct order with properly formatted timestamps.'
+    );
   });
 });
 

tests/pages/conversations.js

@@ -4,12 +4,14 @@ import {
   visitable
 } from 'ember-cli-page-object';
 import conversationThread from 'code-corps-ember/tests/pages/components/conversations/conversation-thread';
+import conversationListItemWithProject from 'code-corps-ember/tests/pages/components/conversations/conversation-list-item-with-project';
 
 export default create({
   visit: visitable('/conversations'),
 
   conversations: collection({
-    itemScope: '.conversation-list-item'
+    itemScope: '.conversation-list-item',
+    item: conversationListItemWithProject
   }),
 
   conversationThread