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

Fix test failures due to previous commit

Browse Source
This commit is contained in:
JC Brand 2014-06-14 22:03:04 +02:00
parent 4273e19716
commit c9d7e17a10
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
converse.js
View File

@ -2706,7 +2706,7 @@
var id = b64_sha1('converse.minchatstoggle'+this.bare_jid); var id = b64_sha1('converse.minchatstoggle'+this.bare_jid);
this.toggleview.model.id = id; // Appears to be necessary for backbone.localStorage this.toggleview.model.id = id; // Appears to be necessary for backbone.localStorage
this.toggleview.model.localStorage = new Backbone.LocalStorage(id); this.toggleview.model.localStorage = new Backbone.LocalStorage(id);
this.toggleview.model.fetch({success: callback, error: callback}); this.toggleview.model.fetch();
}, },
render: function () { render: function () {

4
spec/converse.js
View File

@ -16,7 +16,7 @@
it("has an API method for retrieving the next RID", $.proxy(function () { it("has an API method for retrieving the next RID", $.proxy(function () {
var old_connection = converse.connection; var old_connection = converse.connection;
converse.connection.rid = '1234'; converse.connection._proto.rid = '1234';
converse.expose_rid_and_sid = false; converse.expose_rid_and_sid = false;
expect(converse_api.getRID()).toBe(null); expect(converse_api.getRID()).toBe(null);
@ -31,7 +31,7 @@
it("has an API method for retrieving the SID", $.proxy(function () { it("has an API method for retrieving the SID", $.proxy(function () {
var old_connection = converse.connection; var old_connection = converse.connection;
converse.connection.sid = '1234'; converse.connection._proto.sid = '1234';
converse.expose_rid_and_sid = false; converse.expose_rid_and_sid = false;
expect(converse_api.getSID()).toBe(null); expect(converse_api.getSID()).toBe(null);

2
tests/main.js
View File

@ -69,7 +69,7 @@ require([
delete converse.callback; delete converse.callback;
// Stub the trimChat method. It causes havoc when running with // Stub the trimChat method. It causes havoc when running with
// phantomJS. // phantomJS.
converse.ChatBoxView.prototype.trimChat = function () {}; converse.ChatBoxViews.prototype.trimChat = function () {};
// Jasmine stuff // Jasmine stuff
var jasmineEnv = jasmine.getEnv(); var jasmineEnv = jasmine.getEnv();

1
tests/mock.js
View File

@ -29,6 +29,7 @@
}; };
mock.mock_connection = { mock.mock_connection = {
'_proto': {},
'mock': true, 'mock': true,
'muc': { 'muc': {
'listRooms': function () {}, 'listRooms': function () {},