Merge pull request #87 from RoundingWell/master

Master into Develop for Release-20190919
RoundingWell · Sep 23, 2019 · 4aadfe5 · 4aadfe5
2 parents 5a56198 + c021ede
commit 4aadfe5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/js/views/patients/list/patients-all_views.js b/src/js/views/patients/list/patients-all_views.js
@@ -31,7 +31,7 @@ const ItemView = View.extend({
   `,
   templateContext() {
     return {
-      groups: _.map(this.model.getGroups().models, 'attributes'),
+      groups: _.sortBy(_.map(this.model.getGroups().models, 'attributes'), 'name'),
     };
   },
   triggers: {

diff --git a/test/integration/patients/list/patients-all.js b/test/integration/patients/list/patients-all.js
@@ -48,7 +48,7 @@ context('patient all list', function() {
       .find('.table-list__item')
       .first()
       .should('contain', 'Aaron Aaronson')
-      .should('contain', 'Group One')
+      .should('contain', 'Another Group, Group One')
       .click();
 
     cy