Merge pull request #446 from crdlc/bug-1120948

Bug 1120948 - [Loop] New name in room isnt visible in rooms list of invi...

app/js/screens/calllog.js

@@ -1061,7 +1061,11 @@
       _appendRoom(room);
       return room;
     }, (error) => {
-      console.error('ERROR when storing the room ' + error);
+      // Sometimes we don't know if the room already exists and we want to
+      // update this one. So we can call to this methods and it ensures that the
+      // room will be created or updated depending on the case.
+      console.log('Storing the room failed. Trying to update the existing one');
+      return CallLog.updateRoom(room);
     });
   }
 

test/unit/test_calllog.js

@@ -0,0 +1,30 @@
+'use strict';
+
+require('js/helpers/database_helper.js');
+require('js/helpers/rooms_db.js');
+require('js/screens/calllog.js');
+
+suite('Tests CallLog', function() {
+
+  test('CallLog should exist', function() {
+    chai.assert.isNotNull(CallLog);
+  });
+
+  test('Update room when addition fails', function(done) {
+    var room = {
+      roomToken: 'ab583hfkskls'
+    };
+
+    sinon.stub(CallLog, 'updateRoom', function(myRoom) {
+      chai.assert.equal(myRoom.roomToken, room.roomToken);
+      done();
+    });
+
+    sinon.stub(RoomsDB, 'create', function(myRoom) {
+      return Promise.reject();
+    });
+
+    CallLog.addRoom(room);
+  });
+
+});