Merge pull request #23805 from arcturus/bug-1064256

Bug 1064256 - [Contacts] "TypeError: iceGroup is null" r=sergi
mozilla-b2g · Sep 11, 2014 · 84fe309 · 84fe309
2 parents 2f4d1d1 + 780c5f1
commit 84fe309
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/apps/communications/contacts/js/views/list.js b/apps/communications/contacts/js/views/list.js
@@ -841,15 +841,17 @@ contacts.List = (function() {
   }
 
   function displayICEIndicator(ids) {
+    if (!iceGroup) {
+      buildICEGroup();
+    }
+
     if (!ids || ids.length === 0) {
       hideICEGroup();
       return;
     }
 
     iceContacts = ids;
-    if (iceGroup === null) {
-      buildICEGroup();
-    }
+
     showICEGroup();
   }
 

diff --git a/apps/communications/contacts/test/unit/views/list_test.js b/apps/communications/contacts/test/unit/views/list_test.js
@@ -1724,12 +1724,34 @@ suite('Render contacts list', function() {
       this.sinon.spy(MockAlphaScroll, 'hideGroup');
     });
 
+    test('> ICE group is always build but is hidden', function() {
+      var stub = ICEStore.getContacts;
+      ICEStore.getContacts = function() {
+        return {
+          then: function(cb) {
+            cb();
+          }
+        };
+      };
+
+      mockContacts = new MockContactsList();
+      subject.load(mockContacts);
+      // ICE group created, even if we don't have contacts
+      var iceGroup = document.getElementById('section-group-ice');
+      assert.isNotNull(iceGroup);
+      // ICE group not visible
+      assert.isTrue(iceGroup.classList.contains('hide'));
+
+      ICEStore.getContacts = stub;
+    });
+
     test('Display the ICE group if ICE contacts present', function() {
       mockContacts = new MockContactsList();
       subject.load(mockContacts);
       // Check ice group present
       var iceGroup = document.getElementById('section-group-ice');
       assert.isNotNull(iceGroup);
+      assert.isFalse(iceGroup.classList.contains('hide'));
       // Check that we are displaying the extra item in the alphascroll
       sinon.assert.calledOnce(MockAlphaScroll.showGroup);
       sinon.assert.calledWith(MockAlphaScroll.showGroup, 'ice');

diff --git a/tests/python/gaia-ui-tests/gaiatest/apps/contacts/app.py b/tests/python/gaia-ui-tests/gaiatest/apps/contacts/app.py
@@ -23,7 +23,7 @@ class Contacts(Base):
     _status_message_locator = (By.ID, 'statusMsg')
 
     #  contacts
-    _contact_locator = (By.CSS_SELECTOR, 'li.contact-item')
+    _contact_locator = (By.CSS_SELECTOR, 'li.contact-item:not([data-group="ice"])')
 
     def launch(self):
         Base.launch(self)