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

Fix tests by depending on jquery obj.

Browse Source 
Also fixed groupchat test by getting and including correct msg id.
This commit is contained in:
JC Brand 2014-10-15 19:16:02 +02:00
parent a88c786991
commit 4a89d28e38
9 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -29,7 +29,7 @@
"bootstrap": "~3.2.0",
"bootstrapJS": "https://raw.githubusercontent.com/jcbrand/bootstrap/7d96a5f60d26c67b5348b270a775518b96a702c8/dist/js/bootstrap.js",
"fontawesome": "~4.1.0",
"typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js"
"typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js",
"strophejs-plugins": "~0.0.4"
},
"exportsOverride": {}

7
spec/chatbox.js
View File

@ -1,12 +1,13 @@
(function (root, factory) {
define([
"jquery",
"mock",
"test_utils"
], function (mock, test_utils) {
return factory(mock, test_utils);
], function ($, mock, test_utils) {
return factory($, mock, test_utils);
}
);
} (this, function (mock, test_utils) {
} (this, function ($, mock, test_utils) {
return describe("Chatboxes", $.proxy(function(mock, test_utils) {
describe("A Chatbox", $.proxy(function () {
beforeEach(function () {

11
spec/chatroom.js
View File

@ -1,12 +1,13 @@
(function (root, factory) {
define([
"jquery",
"mock",
"test_utils"
], function (mock, test_utils) {
return factory(mock, test_utils);
], function ($, mock, test_utils) {
return factory($, mock, test_utils);
}
);
} (this, function (mock, test_utils) {
} (this, function ($, mock, test_utils) {
return describe("ChatRooms", $.proxy(function (mock, test_utils) {
describe("A Chat Room", $.proxy(function () {
beforeEach(function () {
@ -139,9 +140,9 @@
var message = $msg({
from: 'lounge@localhost/dummy',
id: '2',
to: 'dummy@localhost.com',
type: 'groupchat'
type: 'groupchat',
id: view.model.messages.at(0).get('msgid')
}).c('body').t(text);
view.onChatRoomMessage(message.nodeTree);
var $chat_content = view.$el.find('.chat-content');

7
spec/controlbox.js
View File

@ -1,12 +1,13 @@
(function (root, factory) {
define([
"jquery",
"mock",
"test_utils"
], function (mock, test_utils) {
return factory(mock, test_utils);
], function ($, mock, test_utils) {
return factory($, mock, test_utils);
}
);
} (this, function (mock, test_utils) {
} (this, function ($, mock, test_utils) {
var checkHeaderToggling = function ($header) {
var $toggle = $header.find('a.group-toggle');

7
spec/converse.js
View File

@ -1,12 +1,13 @@
(function (root, factory) {
define([
"jquery",
"mock",
"test_utils"
], function (mock, test_utils) {
return factory(mock, test_utils);
], function ($, mock, test_utils) {
return factory($, mock, test_utils);
}
);
} (this, function (mock, test_utils) {
} (this, function ($, mock, test_utils) {
return describe("Converse", $.proxy(function(mock, test_utils) {
beforeEach($.proxy(function () {

7
spec/eventemitter.js
View File

@ -1,12 +1,13 @@
(function (root, factory) {
define([
"jquery",
"mock",
"test_utils"
], function (mock, test_utils) {
return factory(mock, test_utils);
], function ($, mock, test_utils) {
return factory($, mock, test_utils);
}
);
} (this, function (mock, test_utils) {
} (this, function ($, mock, test_utils) {
return describe("The Converse Event Emitter", $.proxy(function(mock, test_utils) {
window.localStorage.clear();
window.sessionStorage.clear();

7
spec/minchats.js
View File

@ -1,12 +1,13 @@
(function (root, factory) {
define([
"jquery",
"mock",
"test_utils"
], function (mock, test_utils) {
return factory(mock, test_utils);
], function ($, mock, test_utils) {
return factory($, mock, test_utils);
}
);
} (this, function (mock, test_utils) {
} (this, function ($, mock, test_utils) {
return describe("The Minimized Chats Widget", $.proxy(function(mock, test_utils) {
beforeEach(function () {
runs(function () {

7
spec/otr.js
View File

@ -1,12 +1,13 @@
(function (root, factory) {
define([
"jquery",
"mock",
"test_utils"
], function (mock, test_utils) {
return factory(mock, test_utils);
], function ($, mock, test_utils) {
return factory($, mock, test_utils);
}
);
} (this, function (mock, test_utils) {
} (this, function ($, mock, test_utils) {
return describe("The OTR module", $.proxy(function(mock, test_utils) {
beforeEach($.proxy(function () {

2
tests/mock.js
View File

@ -46,7 +46,7 @@
'join': function () {},
'leave': function () {},
'rooms': {},
'groupchat': function () {}
'groupchat': function () {return String((new Date()).getTime()); }
},
'service': 'jasmine tests',
'jid': 'dummy@localhost',