Merge pull request #14892 from etiennesegonzac/bug-948975-resume-sing…

…le-conference-group Bug 948975 - Safeguard to make sure we can always resume a single held conference call. r=rik
mozilla-b2g · Jan 7, 2014 · 7354e63 · 7354e63
2 parents d6cc675 + 89ebe77
commit 7354e63
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/apps/communications/dialer/js/calls_handler.js b/apps/communications/dialer/js/calls_handler.js
@@ -615,18 +615,25 @@ var CallsHandler = (function callsHandler() {
   }
 
   function holdOrResumeSingleCall() {
-    if (handledCalls.length !== 1) {
+    var openLines = telephony.calls.length +
+      (telephony.conferenceGroup.calls.length ? 1 : 0);
+
+    if (openLines !== 1) {
       return;
     }
-    if (telephony.calls[0].state === 'incoming') {
+
+    if (telephony.calls.length && telephony.calls[0].state === 'incoming') {
       return;
     }
 
     if (telephony.active) {
       telephony.active.hold();
       CallScreen.render('connected-hold');
     } else {
-      telephony.calls[0].resume();
+      var line = telephony.calls.length ?
+        telephony.calls[0] : telephony.conferenceGroup;
+
+      line.resume();
       CallScreen.render('connected');
     }
   }

diff --git a/apps/communications/dialer/test/unit/calls_handler_test.js b/apps/communications/dialer/test/unit/calls_handler_test.js
@@ -863,7 +863,7 @@ suite('calls handler', function() {
     });
 
     suite('> CallsHandler.toggleCalls()', function() {
-      suite('> toggling a simple call', function() {
+      suite('> toggling a single call', function() {
         var mockCall;
 
         setup(function() {
@@ -925,6 +925,25 @@ suite('calls handler', function() {
           CallsHandler.toggleCalls();
           assert.isFalse(holdSpy.called);
         });
+
+        suite('when the conference call is holded', function() {
+          setup(function() {
+            MockMozTelephony.active = null;
+          });
+
+          test('should resume the conference call', function() {
+            var resumeSpy = this.sinon.spy(MockMozTelephony.conferenceGroup,
+                                           'resume');
+            CallsHandler.toggleCalls();
+            assert.isTrue(resumeSpy.calledOnce);
+          });
+
+          test('should render the CallScreen in connected mode', function() {
+            var renderSpy = this.sinon.spy(MockCallScreen, 'render');
+            CallsHandler.toggleCalls();
+            assert.isTrue(renderSpy.calledWith('connected'));
+          });
+        });
       });
 
       suite('> toggling between 2 calls', function() {