Commit Graph

19 Commits

Author SHA1 Message Date
JC Brand
a18b28f953 Fix tests 2013-08-31 20:53:12 +02:00
JC Brand
e4cf875d24 Merge branch 'master' into otr
Conflicts:
	bower.json
	converse.css
	converse.js
	main.js
	tests_main.js
2013-08-30 20:26:48 +02:00
JC Brand
9628189382 Can't call i18n.translate directly if we bundle without i18n support 2013-08-26 16:21:32 +02:00
JC Brand
2c0ae11fb7 Remove sjcl, which is not being used anymore 2013-08-25 23:27:07 +02:00
JC Brand
a95634fb26 Add crypto.aes to tests_main 2013-08-25 12:20:26 +02:00
JC Brand
4bc2b7227f Fixed tests initialization (broken during recent refactor) 2013-08-24 03:10:06 +02:00
JC Brand
5551ff0127 When prebinding, attach automatically. Fixes #41
This requires that valid jid, rid, sid and bosh_service_url values be given (or
a valid connection object that was already attached).

Updated the docs to reflect these changes.
2013-08-23 00:51:32 +02:00
JC Brand
2d4a14ac2d Don't expose the Strophe connection object globally.
Instead, expose only the initialize and onConnected functions.
Updated the tests to work with this.
2013-08-05 09:25:29 +02:00
JC Brand
c5192f8ade Bugfix. Updates #32
Users without roster contacts didn't have XMPPStatus.initStatus called and
therefore had a default status of offline.

Fixed this by setting the status to online from the start. The fetch command
will get the true status from localStorage (if available).

Made sure that the rest of converse's onConnected code is called in the
callback from fetch (so that we know the user's status is correct).

Updated and fixed tests.
2013-08-04 15:39:46 +02:00
JC Brand
7da5ff4aef Add a page for testing the minified JS and CSS 2013-07-30 23:05:47 +02:00
JC Brand
fb9fc87952 Fixed paths in tests_main.js and tests.html 2013-07-30 00:16:04 +02:00
JC Brand
c85c9f043a Separate update intervals for browser and phantomjs 2013-07-28 22:21:56 +02:00
JC Brand
143875bf32 Add jasmine and jasmine-html as require deps. Also add Console reporter 2013-07-28 21:20:36 +02:00
JC Brand
a9a3724766 Initial works towards having headless tests with PhantomJS 2013-07-27 10:51:55 +02:00
JC Brand
39ef1b81e8 Add a bit more delay between tests 2013-05-14 09:44:30 +02:00
JC Brand
6d9fe68a25 Split ChatRooms tests out into their own spec file 2013-05-11 14:20:07 +02:00
JC Brand
7c1a9242d5 Add logic to parse error messages when trying to enter a room 2013-05-11 09:59:32 +02:00
JC Brand
9ee92f245c Changes from master 2013-04-17 12:11:59 +02:00
JC Brand
746862f24b Copy over all files from master 2013-04-15 10:01:07 +02:00