74ffbdea79
bump vs
2014-11-28 18:02:11 +00:00
3224122f7e
correct kernel v#
2014-11-28 17:47:55 +00:00
3bf9f3cf1d
Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change
2014-11-28 17:43:01 +00:00
c6d7ed114e
script to update all plugins with one command on CLI
2014-11-28 16:27:12 +00:00
a642deaa72
gritter css fix
2014-11-28 02:25:21 +00:00
68979e1212
better fix
2014-11-28 00:35:46 +00:00
e6d85bbe69
fix issue with top of chatbox not being aligned properly
2014-11-28 00:26:34 +00:00
edc5669fa6
Merge pull request #2344 from ether/backend-tests
...
Backend tests
2014-11-28 00:04:12 +00:00
422cfec27a
Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change
2014-11-28 00:01:47 +00:00
8b787b8d23
readme docs for backend tests
2014-11-27 23:58:50 +00:00
936e92e044
fix tests in FF
2014-11-27 23:48:14 +00:00
d36911da30
fix timeslider tests
2014-11-27 23:36:19 +00:00
47029f2e6b
diable caret tests for now
2014-11-27 23:10:40 +00:00
617514b335
mst tests still brkoen but it runs
2014-11-27 17:12:24 +00:00
ff58897679
fix frontend tests
2014-11-27 16:58:04 +00:00
3ca48ed975
fix undo in chrome etc
2014-11-27 16:49:08 +00:00
c13301966f
yeah need htis too
2014-11-27 02:56:42 +00:00
61c6deda2e
use a forked require-kernel
2014-11-27 02:44:48 +00:00
65fb25d71f
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-11-27 02:24:12 +00:00
e51ab2db24
fix for #2132
2014-11-26 23:37:44 +00:00
fa5130978c
path issues for supertitties
2014-11-26 22:10:56 +00:00
cff8f4a61e
remember to add supertest
2014-11-26 21:58:27 +00:00
e9115880b3
final api test written for now
2014-11-26 21:44:50 +00:00
198e211671
4 more to go
2014-11-26 21:36:57 +00:00
253d6da2ac
60% of backend api tests written
2014-11-26 21:19:55 +00:00
98cc725300
30% of session and group tests done
2014-11-26 21:06:35 +00:00
f3c2ac6d94
mowah pad tests, tea time
2014-11-26 19:44:38 +00:00
5434d2118d
tidy up and re-organize
2014-11-26 19:28:49 +00:00
c0679980bf
all pad tests with content
2014-11-26 19:25:09 +00:00
1347a814f0
basic pad tests without test logic yet
2014-11-26 17:53:31 +00:00
16f3ebb3ba
handle auth fails
2014-11-26 17:34:44 +00:00
88b3d99fbd
Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests
2014-11-26 15:33:13 +00:00
b4ddeffd04
Merge pull request #2341 from ether/jsdom-go-away
...
Use cheerio instead of jsdom
2014-11-26 15:19:42 +00:00
0a84379364
make additional line break at end of imported doc
2014-11-26 15:19:22 +00:00
7a4a3b5ef3
make internal note of which endpoints need testing
2014-11-26 01:11:42 +00:00
a4be5b4fd7
mocha version
2014-11-26 01:03:57 +00:00
8851b8ab6b
Merge branch 'develop' of github.com:ether/etherpad-lite into jsdom-go-away
2014-11-25 22:48:09 +00:00
3ac833d455
basic test runner
2014-11-25 22:47:22 +00:00
881763f663
remove jsdom dep
2014-11-25 22:15:29 +00:00
77de2d918b
multiline
2014-11-25 22:14:48 +00:00
ad7de8277d
mocha
2014-11-25 22:12:25 +00:00
3a28db7f40
Merge pull request #2342 from ether/fix-2320-crash
...
fix #2320
2014-11-25 22:09:03 +00:00
5c3874c0a1
really recreate socketio-client in expressCreateServer, fixes #2342
...
When using plugins, the express server gets restarted. When we do that,
the socketio-server should also get restarted. It doesn't. That means
that all the events in SocketIORouter.js are bound twice, which causes
chaos all over etherpad.
This changes our socketio.js so it fully recreates the io-instance when
we restart the server.
introduced in 95e7b0f156
2014-11-25 22:38:22 +01:00
2a062f8dc3
mheh no browser requirement at all
2014-11-25 18:18:42 +00:00
c2c0cb6907
so yeah, prolly can do this anyway?
2014-11-25 18:07:34 +00:00
60d44cd3df
use cheerio instead of jsdom
2014-11-25 17:26:09 +00:00
97068b562d
more old load testing cruft
2014-11-25 01:22:32 +00:00
5e843a5877
remove jshint
2014-11-25 01:21:19 +00:00
945d6c83c1
Merge pull request #2336 from ether/more-socket-io-fixes
...
more fixes
2014-11-23 22:34:30 +00:00
a3f6b2edb7
more fixes
2014-11-23 22:33:56 +00:00
John McLear