ae25c085e0
a better way of geting href but note that it only works if we use settimeotu but settimeout breaks mocha so it's not okay. Peter please find a way of making sendkeys allow for callbacks, k tnx
2012-10-05 00:38:07 +01:00
9d7d973faa
This is a superghetto hack fix for testing button_indentation, Peter please make it less horrible, tnx :)
2012-10-05 00:14:46 +01:00
84ec5abb8f
more indentation testing but have hit a brick wall unable to get the second div inside the editor. I tried nth-child, next, find and children but to no avail. Anyone any ideas?
2012-10-04 23:01:33 +01:00
66a25adf62
put all scripts back into index
2012-10-04 21:17:16 +01:00
5c54b2c681
attempt to move onClick away from HTML.. This is required
2012-10-04 21:16:58 +01:00
7eecfa17b7
test for basic indent and outdent, needs more work
2012-10-04 21:02:34 +01:00
edc8ff6a41
adding other tests back to index
2012-10-04 20:44:42 +01:00
7f819967f9
a script for testing font change
2012-10-04 20:44:21 +01:00
fa9c5531e9
a test to check teh value of embed links
2012-10-04 20:02:29 +01:00
ff22ae9206
fix keystroke delete test
2012-10-04 19:12:01 +01:00
1466b31c54
slightly uglier UI but still ugly
2012-10-04 19:08:29 +01:00
c74aed986e
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests
2012-10-04 18:55:57 +01:00
a97c63b809
Fix issue caused by broken async update
2012-10-04 18:53:02 +01:00
07182bb716
Changed the send keys library so that its works with elements inside an iframe
2012-10-04 16:22:05 +02:00
95ce0aaba8
merged remote feature/frontend-tests
2012-10-04 14:35:25 +02:00
24988d659c
This test should work, Peter, why does this test not work?
2012-10-03 21:55:23 +01:00
38ef46449b
add delete stroke test to index page of /tests/frontend
2012-10-03 21:26:48 +01:00
339ee6d2e0
working keystroke delete check
2012-10-03 21:25:31 +01:00
aa41ebcd6d
include a sendkeys library to emulate sending keypresses
2012-10-03 21:15:56 +01:00
7820e3eb7c
beginning of keystroke test
2012-10-03 20:57:04 +01:00
54a77458d6
clean up helper file
2012-10-03 20:56:52 +01:00
7aee98bce8
made test helpers more cross browser compatible
2012-10-03 17:37:48 +01:00
66475f32f3
Merge pull request #1003 from Pita/express-v3
...
Upgrade Express to v3 [proposal]
2012-10-03 06:25:44 -07:00
f408d0f9c7
Merge pull request #1038 from cweider/fix-relative
...
Upgrade to Yajsml bug fix.
2012-10-03 06:16:28 -07:00
2684a1d295
Merge branch 'develop' into express-v3
...
Conflicts:
src/node/hooks/express/errorhandling.js
2012-10-03 10:09:00 +02:00
b29fc11e9d
Upgrade to Yajsml bug fix.
2012-10-02 19:57:23 -07:00
2cf46d3964
Merge pull request #1031 from gedion/develop
...
Update docs for new hooks and ace exposures
2012-10-02 11:31:58 -07:00
c0a2202e34
Merge pull request #1033 from marcelklehr/fix/shutdown-on-middlware-error
...
Don't shut down the whole server, if error handling middleware is called...
2012-10-02 11:31:41 -07:00
7656001cb5
Don't shut down the whole server, if error handling middleware is called.
...
The errors passed to error handling middleware aren't that severe, so it's fine to just stay alive...
2012-10-02 20:11:18 +02:00
649a28b6c6
first user contributed test, note the two files that needed to be edited, this kinda sucks
2012-10-02 15:32:31 +01:00
56453409a5
Update src/static/js/pad_editbar.js
...
Somehow </iframe> was no more. Now it is back.. Oh boy.
2012-10-02 02:19:44 +02:00
6009903095
added comments to ace exposed methods
2012-10-01 19:18:19 -05:00
61022be6e4
added comments to ace exposed methods
2012-10-01 19:14:27 -05:00
ba4ebbba3b
Setted up an enviroment for frontend tests, first steps
2012-10-02 00:35:43 +01:00
7f6a81b0ed
Merge pull request #1006 from cweider/ace-cleanup
...
Ace cleanup
2012-10-01 13:05:10 -07:00
3fe3df91ae
update docs for new hooks and ace exposures
2012-09-30 17:13:14 -05:00
c75941d1e3
Merge pull request #1028 from amtep/develop
...
Fix server crash if client disconnects too soon after connecting
2012-09-30 04:22:36 -07:00
d91b1ecd24
Merge pull request #1020 from marcelklehr/fix/express-v3
...
Fixes for express-v3 branch
2012-09-30 04:22:17 -07:00
2e72a1e489
Prevent server crash in handleClientReady
...
The client might have disconnected between callbacks so don't try to
write to the session before checking this. The main callback of this
function now has a single check at its top.
Removed a redundant check halfway through the callback.
Also normalized use of client.id for the session index instead of a mix of
client.id and sessionId.
Added some explanatory comments.
2012-09-28 23:23:00 +03:00
413ddb393e
Add some explanatory comments to handleUserChanges()
2012-09-28 22:49:20 +03:00
3578e36616
Merge pull request #1025 from amtep/develop
...
Fix race condition and a stack error caused by too old changesets
2012-09-28 05:43:47 -07:00
7aaef01346
Prettify session handling in handleUserChanges
...
Also add a comment to explain what's going on with thisSession.
No changes in behavior.
2012-09-27 23:07:00 +03:00
f1b4206cad
Fix crash when client submits changeset based on too-old revision
...
We had a problem with the server running out of stack space if a client
submitted a changeset based on a revision more than about 1000 revs old.
(944 was our cutoff but yours may vary). This happened in the wild with
about 30 people editing via flaky wifi. A disconnected client would try
to submit a fairly old changeset when reconnecting, and a few minutes
was enough for 30 people to generate that many revs.
The stack kept growing because pad.getRevisionChangeset was being answered
from the cache, so no I/O interrupted the callback chain. (This was seen with
mysql, I don't know about other backends.)
This patch forces a nextTick every 200 revisions to solve this problem.
2012-09-26 03:01:59 +03:00
e16008b371
Fix sessioninfos race that can cause crash during USER_CHANGES handling
...
When stress testing etherpad-lite we occasionally got this error:
TypeError: Cannot read property 'author' of undefined
at /home/etherpad/etherpad-lite/src/node/handler/PadMessageHandler.js:556:47
handleUserChanges was accessing sessioninfos[client.id].author in a callback,
after spending some time in the loop that updates the changeset to the
latest revision. It's possible for a disconnect request to be processed
during that loop so the session might no longer be there.
This patch fixes it by looking up the author at the start of the function.
2012-09-26 03:01:59 +03:00
49799bfa97
Merge pull request #1018 from cweider/fix-windows
...
Upgrade to Yajsml with another Windows backslash fix.
2012-09-22 07:17:53 -07:00
1c38f5bab9
Update docs
2012-09-22 16:04:30 +02:00
0c9c1f514f
Fix socket.io auth: Use connect to parse signed cookies (migrate to express v3)
2012-09-22 16:03:40 +02:00
0f436d5916
Migrate error handling middleware to express v3
2012-09-22 15:22:15 +02:00
794c3d1afe
Set secret on cookieParser (migrate to express v3)
2012-09-22 14:05:41 +02:00
71579d1478
Fix res.send (migrate to express v3)
2012-09-22 13:51:39 +02:00
johnyma22