Merge pull request #14504 from etiennesegonzac/bug-943716-flatfish-co…

…ntact-bug Bug 943716 - Don't try dialing from the contact app if if mozTelephony is unavailable. r=arcturus
mozilla-b2g · Dec 16, 2013 · 5705238 · 5705238
2 parents e87db7e + 030c626
commit 5705238
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/apps/communications/contacts/js/contacts.js b/apps/communications/contacts/js/contacts.js
@@ -412,7 +412,7 @@ var Contacts = (function() {
             number: number
           }
         });
-      } else {
+      } else if (navigator.mozTelephony) {
         TelephonyHelper.call(number);
       }
     });

diff --git a/apps/communications/contacts/test/marionette/details_test.js b/apps/communications/contacts/test/marionette/details_test.js
@@ -13,31 +13,21 @@ marionette('Contacts > Details', function() {
     selectors = Contacts.Selectors;
   });
 
-  suite('Click phone number', function() {
-    test('Shows error /w no sim', function() {
-      var tel = 1231231234;
+  test('Display the phone number', function() {
+    var tel = 1231231234;
 
-      subject.addContact({
-        givenName: 'Hello',
-        tel: 1231231234
-      });
-
-      client.helper.waitForElement(selectors.listContactFirstText)
-        .click();
-
-      subject.waitSlideLeft('details');
-
-      client.helper.waitForElement(selectors.detailsTelButtonFirst)
-        .click();
+    subject.addContact({
+      givenName: 'Hello',
+      tel: tel
+    });
 
-      var header = client.helper.waitForElement(selectors.confirmHeader);
+    client.helper.waitForElement(selectors.listContactFirstText)
+      .click();
 
-      var expectedHeaderText = subject.l10n(
-        '/dialer/locales/shared.en-US.properties',
-        'emergencyDialogTitle');
+    subject.waitSlideLeft('details');
 
-      assert.equal(header.text(), expectedHeaderText);
-    });
+    var telNode = client.helper.waitForElement(selectors.detailsTelButtonFirst);
+    assert.equal(telNode.text(), tel);
   });
 
 });