John McLear
d36911da30
fix timeslider tests
2014-11-27 23:36:19 +00:00
John McLear
47029f2e6b
diable caret tests for now
2014-11-27 23:10:40 +00:00
John McLear
617514b335
mst tests still brkoen but it runs
2014-11-27 17:12:24 +00:00
John McLear
ff58897679
fix frontend tests
2014-11-27 16:58:04 +00:00
John McLear
3ca48ed975
fix undo in chrome etc
2014-11-27 16:49:08 +00:00
John McLear
c13301966f
yeah need htis too
2014-11-27 02:56:42 +00:00
John McLear
61c6deda2e
use a forked require-kernel
2014-11-27 02:44:48 +00:00
John McLear
65fb25d71f
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-11-27 02:24:12 +00:00
John McLear
2c728b8e1b
sanitizer change
2014-11-27 00:45:22 +00:00
John McLear
e51ab2db24
fix for #2132
2014-11-26 23:37:44 +00:00
John McLear
fa5130978c
path issues for supertitties
2014-11-26 22:10:56 +00:00
John McLear
cff8f4a61e
remember to add supertest
2014-11-26 21:58:27 +00:00
John McLear
e9115880b3
final api test written for now
2014-11-26 21:44:50 +00:00
John McLear
198e211671
4 more to go
2014-11-26 21:36:57 +00:00
John McLear
253d6da2ac
60% of backend api tests written
2014-11-26 21:19:55 +00:00
John McLear
98cc725300
30% of session and group tests done
2014-11-26 21:06:35 +00:00
John McLear
f3c2ac6d94
mowah pad tests, tea time
2014-11-26 19:44:38 +00:00
John McLear
5434d2118d
tidy up and re-organize
2014-11-26 19:28:49 +00:00
John McLear
c0679980bf
all pad tests with content
2014-11-26 19:25:09 +00:00
John McLear
1347a814f0
basic pad tests without test logic yet
2014-11-26 17:53:31 +00:00
John McLear
16f3ebb3ba
handle auth fails
2014-11-26 17:34:44 +00:00
John McLear
88b3d99fbd
Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests
2014-11-26 15:33:13 +00:00
John McLear
b4ddeffd04
Merge pull request #2341 from ether/jsdom-go-away
...
Use cheerio instead of jsdom
2014-11-26 15:19:42 +00:00
John McLear
0a84379364
make additional line break at end of imported doc
2014-11-26 15:19:22 +00:00
John McLear
7a4a3b5ef3
make internal note of which endpoints need testing
2014-11-26 01:11:42 +00:00
John McLear
a4be5b4fd7
mocha version
2014-11-26 01:03:57 +00:00
John McLear
8851b8ab6b
Merge branch 'develop' of github.com:ether/etherpad-lite into jsdom-go-away
2014-11-25 22:48:09 +00:00
John McLear
3ac833d455
basic test runner
2014-11-25 22:47:22 +00:00
John McLear
881763f663
remove jsdom dep
2014-11-25 22:15:29 +00:00
John McLear
77de2d918b
multiline
2014-11-25 22:14:48 +00:00
John McLear
ad7de8277d
mocha
2014-11-25 22:12:25 +00:00
John McLear
3a28db7f40
Merge pull request #2342 from ether/fix-2320-crash
...
fix #2320
2014-11-25 22:09:03 +00:00
luto
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
John McLear
2a062f8dc3
mheh no browser requirement at all
2014-11-25 18:18:42 +00:00
John McLear
c2c0cb6907
so yeah, prolly can do this anyway?
2014-11-25 18:07:34 +00:00
John McLear
60d44cd3df
use cheerio instead of jsdom
2014-11-25 17:26:09 +00:00
John McLear
97068b562d
more old load testing cruft
2014-11-25 01:22:32 +00:00
John McLear
5e843a5877
remove jshint
2014-11-25 01:21:19 +00:00
John McLear
945d6c83c1
Merge pull request #2336 from ether/more-socket-io-fixes
...
more fixes
2014-11-23 22:34:30 +00:00
John McLear
a3f6b2edb7
more fixes
2014-11-23 22:33:56 +00:00
John McLear
555d22245d
Merge pull request #2335 from ether/javascript-bower
...
swap out jquery browser for bower but expose browser object to all pages...
2014-11-23 14:15:41 +00:00
John McLear
b0872cc447
Merge pull request #2319 from ether/fix-socket-admin-etc
...
Fixing admin issues due to socket upgrade
2014-11-23 14:15:28 +00:00
John McLear
73bcbbcb89
final commit
2014-11-23 14:15:03 +00:00
John McLear
0eb7cc7864
Merge branch 'develop' of github.com:ether/etherpad-lite into fix-socket-admin-etc
2014-11-23 14:14:11 +00:00
John McLear
ae7da122d7
fix session management
2014-11-23 14:14:01 +00:00
John McLear
5f2e830b72
whoopsi
2014-11-22 19:13:23 +00:00
John McLear
9b66c93d6b
swap out jquery browser for bower but expose browser object to all pages also enable minification.. Seems to work well
2014-11-22 19:11:35 +00:00
John McLear
764b8af5e3
Merge pull request #2334 from luto/api-mystery-crash
...
fix api mystery crash
2014-11-22 15:50:23 +00:00
luto
4eee89ad12
fix api mystery crash
2014-11-22 16:46:37 +01:00
John McLear
1ed12c6555
Merge pull request #2333 from l-y-n-x/admin_path
...
Changed relative path to Etherpad main page in admin settings.
2014-11-22 13:31:09 +00:00
