Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fix failing tests

Browse Source 
after allowing chatting with pending/requesting contacts
This commit is contained in:
JC Brand 2017-02-02 16:37:41 +01:00
parent 1f5522845e
commit 3494691286
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spec/controlbox.js
View File

@ -527,7 +527,7 @@
}); });
converse.rosterview.$el.find(".pending-contact-name:contains('"+name+"')") converse.rosterview.$el.find(".pending-contact-name:contains('"+name+"')")
.siblings('.remove-xmpp-contact').click(); .parent().siblings('.remove-xmpp-contact').click();
expect(window.confirm).toHaveBeenCalled(); expect(window.confirm).toHaveBeenCalled();
expect(converse.connection.sendIQ).toHaveBeenCalled(); expect(converse.connection.sendIQ).toHaveBeenCalled();
@ -556,7 +556,7 @@
}); });
expect(converse.rosterview.get('Pending contacts').$el.is(':visible')).toEqual(true); expect(converse.rosterview.get('Pending contacts').$el.is(':visible')).toEqual(true);
converse.rosterview.$el.find(".pending-contact-name:contains('"+name+"')") converse.rosterview.$el.find(".pending-contact-name:contains('"+name+"')")
.siblings('.remove-xmpp-contact').click(); .parent().siblings('.remove-xmpp-contact').click();
expect(window.confirm).toHaveBeenCalled(); expect(window.confirm).toHaveBeenCalled();
expect(converse.connection.sendIQ).toHaveBeenCalled(); expect(converse.connection.sendIQ).toHaveBeenCalled();
expect(converse.rosterview.get('Pending contacts').$el.is(':visible')).toEqual(false); expect(converse.rosterview.get('Pending contacts').$el.is(':visible')).toEqual(false);
@ -570,7 +570,7 @@
for (var i=0; i<mock.pend_names.length; i++) { for (var i=0; i<mock.pend_names.length; i++) {
name = mock.pend_names[i]; name = mock.pend_names[i];
converse.rosterview.$el.find(".pending-contact-name:contains('"+name+"')") converse.rosterview.$el.find(".pending-contact-name:contains('"+name+"')")
.siblings('.remove-xmpp-contact').click(); .parent().siblings('.remove-xmpp-contact').click();
} }
expect(converse.rosterview.$el.find('dt#pending-xmpp-contacts').is(':visible')).toBeFalsy(); expect(converse.rosterview.$el.find('dt#pending-xmpp-contacts').is(':visible')).toBeFalsy();
})); }));
@ -670,7 +670,7 @@
}); });
converse.rosterview.$el.find(".open-chat:contains('"+name+"')") converse.rosterview.$el.find(".open-chat:contains('"+name+"')")
.siblings('.remove-xmpp-contact').click(); .parent().find('.remove-xmpp-contact').click();
expect(window.confirm).toHaveBeenCalled(); expect(window.confirm).toHaveBeenCalled();
expect(converse.connection.sendIQ).toHaveBeenCalled(); expect(converse.connection.sendIQ).toHaveBeenCalled();
@ -701,7 +701,7 @@
expect(converse.rosterview.$el.find('dt.roster-group').css('display')).toEqual('block'); expect(converse.rosterview.$el.find('dt.roster-group').css('display')).toEqual('block');
converse.rosterview.$el.find(".open-chat:contains('"+name+"')") converse.rosterview.$el.find(".open-chat:contains('"+name+"')")
.siblings('.remove-xmpp-contact').click(); .parent().find('.remove-xmpp-contact').click();
expect(window.confirm).toHaveBeenCalled(); expect(window.confirm).toHaveBeenCalled();
expect(converse.connection.sendIQ).toHaveBeenCalled(); expect(converse.connection.sendIQ).toHaveBeenCalled();
expect(contact.removeFromRoster).toHaveBeenCalled(); expect(contact.removeFromRoster).toHaveBeenCalled();
@ -933,7 +933,7 @@
runs(function () { runs(function () {
expect(converse.rosterview.update).toHaveBeenCalled(); expect(converse.rosterview.update).toHaveBeenCalled();
// Check that they are sorted alphabetically // Check that they are sorted alphabetically
children = converse.rosterview.get('Contact requests').$el.siblings('dd.requesting-xmpp-contact').children('span'); children = converse.rosterview.get('Contact requests').$el.siblings('dd.requesting-xmpp-contact').find('span');
names = []; names = [];
children.each(addName); children.each(addName);
expect(names.join('')).toEqual(mock.req_names.slice(0,mock.req_names.length+1).sort().join('')); expect(names.join('')).toEqual(mock.req_names.slice(0,mock.req_names.length+1).sort().join(''));
@ -959,7 +959,7 @@
runs(function () { runs(function () {
expect(converse.rosterview.get('Contact requests').$el.is(':visible')).toEqual(true); expect(converse.rosterview.get('Contact requests').$el.is(':visible')).toEqual(true);
converse.rosterview.$el.find(".req-contact-name:contains('"+name+"')") converse.rosterview.$el.find(".req-contact-name:contains('"+name+"')")
.siblings('.request-actions') .parent().siblings('.request-actions')
.find('.decline-xmpp-request').click(); .find('.decline-xmpp-request').click();
expect(window.confirm).toHaveBeenCalled(); expect(window.confirm).toHaveBeenCalled();
expect(converse.rosterview.get('Contact requests').$el.is(':visible')).toEqual(false); expect(converse.rosterview.get('Contact requests').$el.is(':visible')).toEqual(false);
@ -993,7 +993,7 @@
}); });
spyOn(contact, 'authorize').andCallFake(function () { return contact; }); spyOn(contact, 'authorize').andCallFake(function () { return contact; });
converse.rosterview.$el.find(".req-contact-name:contains('"+name+"')") converse.rosterview.$el.find(".req-contact-name:contains('"+name+"')")
.siblings('.request-actions') .parent().siblings('.request-actions')
.find('.accept-xmpp-request').click(); .find('.accept-xmpp-request').click();
expect(converse.roster.sendContactAddIQ).toHaveBeenCalled(); expect(converse.roster.sendContactAddIQ).toHaveBeenCalled();
expect(contact.authorize).toHaveBeenCalled(); expect(contact.authorize).toHaveBeenCalled();
@ -1013,7 +1013,7 @@
spyOn(window, 'confirm').andReturn(true); spyOn(window, 'confirm').andReturn(true);
spyOn(contact, 'unauthorize').andCallFake(function () { return contact; }); spyOn(contact, 'unauthorize').andCallFake(function () { return contact; });
converse.rosterview.$el.find(".req-contact-name:contains('"+name+"')") converse.rosterview.$el.find(".req-contact-name:contains('"+name+"')")
.siblings('.request-actions') .parent().siblings('.request-actions')
.find('.decline-xmpp-request').click(); .find('.decline-xmpp-request').click();
expect(window.confirm).toHaveBeenCalled(); expect(window.confirm).toHaveBeenCalled();
expect(contact.unauthorize).toHaveBeenCalled(); expect(contact.unauthorize).toHaveBeenCalled();