Fix bugs for Sprint 1

* fixed grammar error

* QBWEBSDK-290

* up tests (set custom interval to all async. methods)

* upd dataSpec also

* QBWEBSDK-276

* QBWEBSDK-270

* change to enum

Author: dimaspirit

samples/webrtc/index.html

@@ -20,8 +20,7 @@
         <header class="header">
             <div class="inner">
                 <div class="header__logo">
-                    <img class="header__logo_img" src="images/Logo_qb.svg">
-                    </img>
+                    <img class="header__logo_img" src="images/Logo_qb.svg"></img>
                 </div>
 
                 <h2 class="header__title">JavaScript WebRTC Sample</h2>
@@ -34,8 +33,10 @@ <h2 class="header__title">JavaScript WebRTC Sample</h2>
                 <form class="join j-join">
                     <h3 class="join__title">
                         <p>Please enter your username and chat room name.</p>
-                        <p>You can join existed chat room.</p>
-                        <p class="join__notice">Use several browsers to simulate several users.</p>
+                        <p>You can join existent chat room.</p>
+                        <p class="join__notice">
+                            Use several browsers to simulate several users.
+                        </p>
                     </h3>
 
                     <div class="join__body">
@@ -316,9 +317,15 @@ <h4 class="caller__name">
     <script type="text/template" id="callee_video">
         <div class="frames_callee callees__callee j-callee">
             <div class="frames_callee__inner">
-                <p class="frames_callee__status j-callee_status_<%=userID%>">Connecting</p>
+                <p class="frames_callee__status j-callee_status_<%=userID%>">
+                    <%=state%>
+                </p>
+
                 <div class="qb-video">
-                    <video class="j-callees__callee__video qb-video_source" id="remote_video_<%=userID%>" data-user="<%=userID%>"></video>
+                    <video class="j-callees__callee__video qb-video_source"
+                        id="remote_video_<%=userID%>"
+                        data-user="<%=userID%>">
+                    </video>
                 </div>
             </div>
 

samples/webrtc/js/app.js

@@ -1,8 +1,9 @@
 ;(function(window, QB, app, CONFIG, $, Backbone) {
     'use strict';
 
-    /** INIT QB */
     $(function() {
+        var peerConnList = QB.webrtc.PeerConnectionState;
+
         var sounds = {
             'call': 'callingSignal',
             'end': 'endCallSignal',
@@ -30,7 +31,7 @@
                         resolve(res.users);
                     }, function(error) {
                         cb($occupantsCont, error.message);
-                        reject(null);
+                        reject('Not found users by tag');
                     });
                 });
             }
@@ -69,6 +70,11 @@
                     return;
                 }
 
+                if (!_.isEmpty(app.caller)) {
+                    app.router.navigate('dashboard');
+                    return false;
+                }
+
                 this.container
                     .removeClass('page-dashboard')
                     .addClass('page-join');
@@ -82,7 +88,7 @@
                 app.videoMain = 0;
             },
             'dashboard': function() {
-                if (_.isEmpty(app.caller)) {
+                if(_.isEmpty(app.caller)) {
                     app.router.navigate('join', { 'trigger': true });
                     return false;
                 }
@@ -109,6 +115,8 @@
                 $('.j-users_wrap').append( $('#users_tpl').html() );
                 ui.insertOccupants().then(function(users) {
                     app.users = users;
+                }, function(err) {
+                    console.warn(err);
                 });
 
                 /** render frames */
@@ -326,7 +334,11 @@
                                 document.getElementById(sounds.call).play();
 
                                 Object.keys(app.callees).forEach(function(id, i, arr) {
-                                    videoElems += compiled({userID: id, name: app.callees[id] });
+                                    videoElems += compiled({
+                                        'userID': id,
+                                        'name': app.callees[id],
+                                        'state': 'connecting'
+                                    });
                                 });
 
                                 $('.j-callees').append(videoElems);
@@ -407,10 +419,14 @@
                             userInfo = _.findWhere(app.users, {'id': +userID});
 
                         if( (document.getElementById('remote_video_' + userID) === null) ) {
-                            videoElems += compiled({userID: userID, name: userInfo.full_name});
+                            videoElems += compiled({
+                                'userID': userID,
+                                'name': userInfo.full_name,
+                                'state': app.helpers.getConStateName(peerState)
+                            });
 
                             if(peerState === QB.webrtc.PeerConnectionState.CLOSED){
-                                app.helpers.toggleRemoteVideoView( userID, 'clear');
+                                app.helpers.toggleRemoteVideoView(userID, 'clear');
                             }
                         }
                     });
@@ -650,7 +666,6 @@
                     }
                 });
             } else {
-
                 $('.j-callee_status_' + userId).text('Rejected');
             }
         };
@@ -697,6 +712,12 @@
                 console.log('Session: ', session);
             console.groupEnd();
 
+            var state = app.currentSession.connectionStateForUser(userId);
+
+            if(state === peerConnList.DISCONNECTED || state === peerConnList.FAILED || state === peerConnList.CLOSED) {
+                return false;
+            }
+
             app.currentSession.peerConnections[userId].stream = stream;
             app.currentSession.attachMediaStream('remote_video_' + userId, stream);
 

samples/webrtc/js/helpers.js

@@ -72,6 +72,22 @@
             .addClass( filterName );
     };
 
+    app.helpers.getConStateName = function(num) {
+        var answ;
+
+        switch (num) {
+            case QB.webrtc.PeerConnectionState.DISCONNECTED:
+            case QB.webrtc.PeerConnectionState.FAILED:
+            case QB.webrtc.PeerConnectionState.CLOSED:
+                answ = 'DISCONNECTED';
+                break;
+            default:
+                answ = 'CONNECTING';
+        }
+
+        return answ;
+    };
+
     app.helpers.toggleRemoteVideoView = function(userId, action) {
       var $video = $('#remote_video_' + userId);
 

samples/webrtc/styles.css

@@ -56,6 +56,8 @@ b {
         top: 0; bottom: 0;
         left: 0; right: 0;
         max-width: 100%;
+        max-height: 100%;
+        margin: auto;
     }
 
 .qb-error {

spec/QB-ChatSpec.js

@@ -2,7 +2,7 @@ describe('Chat API', function() {
     'use strict';
 
     var LOGIN_TIMEOUT = 10000;
-    var MESSAGING_TIMEOUT = 1500;
+    var MESSAGING_TIMEOUT = 3000;
     var IQ_TIMEOUT = 1000;
     var REST_REQUESTS_TIMEOUT = 3000;
 
@@ -26,7 +26,7 @@ describe('Chat API', function() {
                 'userId': QBUser1.id,
                 'password': QBUser1.password
             }, function(err, roster) {
-                if(err){ done.fail("Chat login error: ", err); }
+                if(err){ done.fail('Chat login error: ' + JSON.stringify(err)); }
 
                 expect(roster).not.toBeNull();
                 done();
@@ -40,11 +40,11 @@ describe('Chat API', function() {
 
       QB.chat.onMessageListener = function(userId, receivedMessage){
         expect(receivedMessage).not.toBeNull();
-        expect(receivedMessage.type).toEqual("chat");
+        expect(receivedMessage.type).toEqual('chat');
         expect(userId).toEqual(QBUser1.id);
         expect(receivedMessage.extension).toEqual({
-          param1: "value1",
-          param2: "value2"
+          param1: 'value1',
+          param2: 'value2'
         });
         expect(receivedMessage.id).toEqual(self.messageId);
         expect(receivedMessage.markable).toEqual(1);
@@ -54,10 +54,10 @@ describe('Chat API', function() {
       };
 
       var message = {
-        type: "chat",
+        type: 'chat',
         extension: {
-          param1: "value1",
-          param2: "value2"
+          param1: 'value1',
+          param2: 'value2'
         },
         markable: 1
       };

spec/QB-CoreSpec.js

@@ -1,54 +1,51 @@
 describe('Session API', function() {
-  'use strict';
+    'use strict';
 
-  var REST_REQUESTS_TIMEOUT = 3000;
+    var REST_REQUESTS_TIMEOUT = 10000;
 
-  var isNodeEnv = typeof window === 'undefined' && typeof exports === 'object';
-  var request = isNodeEnv ? require('request') : {};
+    var isNodeEnv = typeof window === 'undefined' && typeof exports === 'object';
 
-  var QB = isNodeEnv ? require('../src/qbMain') : window.QB;
-  var CREDENTIALS = isNodeEnv ? require('./config').CREDS : window.CREDS;
-  var CONFIG =  isNodeEnv ? require('./config').CONFIG : window.CONFIG;
-  var QBUser1 = isNodeEnv ? require('./config').QBUser1 : window.QBUser1;
+    var QB = isNodeEnv ? require('../src/qbMain') : window.QB;
 
-  /**
-   * TEST CASES
-   */
-  it('can init SDK with session token and appId', function(){
-    QB.init('56655ac9a0eb476d92002b66', CREDENTIALS.appId);
+    var CREDS = isNodeEnv ? require('./config').CREDS : window.CREDS;
+    var CONFIG =  isNodeEnv ? require('./config').CONFIG : window.CONFIG;
+    var QBUser1 = isNodeEnv ? require('./config').QBUser1 : window.QBUser1;
 
-    expect(QB.service.qbInst.config.creds.appId).toEqual(CREDENTIALS.appId);
-  });
-
-  it('can init SDK with appId, authKey, authSecret, config', function(){
-    QB.init(CREDENTIALS.appId, CREDENTIALS.authKey, CREDENTIALS.authSecret, CONFIG);
+    it('can init SDK with session token and appId', function(){
+        QB.init('56655ac9a0eb476d92002b66', CREDS.appId);
 
-    expect(QB.service.qbInst.config.creds.appId).toEqual(CREDENTIALS.appId);
-    expect(QB.service.qbInst.config.creds.authKey).toEqual(CREDENTIALS.authKey);
-    expect(QB.service.qbInst.config.creds.authSecret).toEqual(CREDENTIALS.authSecret);
-    expect(QB.service.qbInst.config.debug).toEqual(CONFIG.debug);
-  });
+        expect(QB.service.qbInst.config.creds.appId).toEqual(CREDS.appId);
+    });
 
-  it('can create a session', function(done){
-    QB.createSession(function (err, session){
-      if(err){
-        done.fail("Create a session error: " + JSON.stringify(err));
-      }else{
-        expect(session).not.toBeNull();
-        expect(session.application_id).toEqual(CREDENTIALS.appId);
+    it('can init SDK with appId, authKey, authSecret, config', function(){
+        QB.init(CREDS.appId, CREDS.authKey, CREDS.authSecret, CONFIG);
 
-        done();
-      }
+        expect(QB.service.qbInst.config.creds.appId).toEqual(CREDS.appId);
+        expect(QB.service.qbInst.config.creds.authKey).toEqual(CREDS.authKey);
+        expect(QB.service.qbInst.config.creds.authSecret).toEqual(CREDS.authSecret);
+        expect(QB.service.qbInst.config.debug).toEqual(CONFIG.debug);
     });
-  }, REST_REQUESTS_TIMEOUT);
+
+    it('can create a session', function(done){
+        QB.createSession(function (err, session){
+            if(err){
+                done.fail('Create a session error: ' + JSON.stringify(err));
+            }else{
+                expect(session).not.toBeNull();
+                expect(session.application_id).toEqual(CREDS.appId);
+
+                done();
+            }
+        });
+    }, REST_REQUESTS_TIMEOUT);
 
   it('can create a User session', function(done){
     QB.createSession(QBUser1, function (err, session){
       if(err){
         done.fail("Create a User session error: " + JSON.stringify(err));
       }else{
         expect(session).not.toBeNull();
-        expect(session.application_id).toEqual(CREDENTIALS.appId);
+        expect(session.application_id).toEqual(CREDS.appId);
         expect(session.user_id).toEqual(QBUser1.id);
 
         done();
@@ -108,7 +105,7 @@ describe('Session API', function() {
       }
     };
 
-    QB.init(CREDENTIALS.appId, CREDENTIALS.authKey, CREDENTIALS.authSecret, CUSTOMCONFIG);
+    QB.init(CREDS.appId, CREDS.authKey, CREDS.authSecret, CUSTOMCONFIG);
 
     expect(QB.service.qbInst.config.endpoints.api).toEqual('apicustomdomain.quickblox.com');
     expect(QB.service.qbInst.config.endpoints.chat).toEqual('chatcustomdomain.quickblox.com');
@@ -124,7 +121,7 @@ describe('Session API', function() {
       }
     };
 
-    QB.init(CREDENTIALS.appId, CREDENTIALS.authKey, CREDENTIALS.authSecret, CUSTOMCONFIG2);
+    QB.init(CREDS.appId, CREDS.authKey, CREDS.authSecret, CUSTOMCONFIG2);
 
     expect(QB.service.qbInst.config.endpoints.api).toEqual('apicustomdomain2.quickblox.com');
     expect(QB.service.qbInst.config.endpoints.chat).toEqual('chatcustomdomain2.quickblox.com');
@@ -140,7 +137,7 @@ describe('Session API', function() {
       }
     };
 
-    QB.init(CREDENTIALS.appId, CREDENTIALS.authKey, CREDENTIALS.authSecret, DEFAULTCONFIG);
+    QB.init(CREDS.appId, CREDS.authKey, CREDS.authSecret, DEFAULTCONFIG);
 
     expect(QB.service.qbInst.config.endpoints.api).toEqual('api.quickblox.com');
     expect(QB.service.qbInst.config.endpoints.chat).toEqual('chat.quickblox.com');