Merge pull request #16994 from mikehenrty/bug-979624-connecting

Bug 979624 - [B2G][Dialer][All languages] Performing a call while in a c..., r=etienne
mozilla-b2g · Mar 14, 2014 · 5b32f4d · 5b32f4d
2 parents a8f436c + 01b0359
commit 5b32f4d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/apps/communications/dialer/style/oncall.css b/apps/communications/dialer/style/oncall.css
@@ -433,6 +433,10 @@
     padding-right: 7rem;
   }
 
+  #calls:not(.big-duration) > section:not(.ended) .duration:not(.isTimer) {
+    visibility: hidden;
+  }
+
   #calls.big-duration > section .numberWrapper,
   #calls.big-duration > section .additionalContactInfo,
   #calls.big-duration > section .switch-calls {

diff --git a/apps/communications/dialer/test/unit/handled_call_test.js b/apps/communications/dialer/test/unit/handled_call_test.js
@@ -473,14 +473,20 @@ suite('dialer/handled_call', function() {
   });
 
   suite('call direction', function() {
-    test('before connexion', function() {
-      assert.isTrue(subject.node.classList.contains('outgoing'));
-    });
 
-    test('after connexion', function() {
-      mockCall._connect();
-      assert.isTrue(subject.node.classList.contains('ongoing'));
-      assert.isTrue(subject.node.classList.contains('outgoing'));
+    suite('outgoing call', function() {
+      setup(function() {
+        mockCall = new MockCall('888', 'outgoing');
+        subject = new HandledCall(mockCall);
+      });
+
+      test('before and after connexion', function() {
+        assert.isTrue(subject.node.classList.contains('outgoing'));
+        assert.isFalse(subject.node.classList.contains('ongoing'));
+        mockCall._connect();
+        assert.isTrue(subject.node.classList.contains('ongoing'));
+        assert.isTrue(subject.node.classList.contains('outgoing'));
+      });
     });
 
     suite('incoming call', function() {
@@ -489,11 +495,9 @@ suite('dialer/handled_call', function() {
         subject = new HandledCall(mockCall);
       });
 
-      test('before connexion', function() {
+      test('before and after connexion', function() {
         assert.isTrue(subject.node.classList.contains('incoming'));
-      });
-
-      test('after connexion', function() {
+        assert.isFalse(subject.node.classList.contains('ongoing'));
         mockCall._connect();
         assert.isTrue(subject.node.classList.contains('ongoing'));
         assert.isTrue(subject.node.classList.contains('incoming'));