Commit graph

2108 commits

Author SHA1 Message Date
Peter 'Pita' Martischka
397036db46 finished urls test 2012-10-08 18:42:52 +01:00
Peter 'Pita' Martischka
7adef188ff rewrote the embed values test 2012-10-08 18:38:53 +01:00
Peter 'Pita' Martischka
bd47b6c40b the monospace test works now 2012-10-08 14:13:35 +02:00
Peter 'Pita' Martischka
a4d68b2b25 runIn was a bad idea 2012-10-08 14:07:56 +02:00
Peter 'Pita' Martischka
27f9906b1e ensure we don't inject a second jquery 2012-10-08 14:07:08 +02:00
Peter 'Pita' Martischka
d4c851875a added a runIn method to the helper 2012-10-08 13:37:24 +02:00
Peter 'Pita' Martischka
ca6ebd6151 major restructering of the front end test framework 2012-10-08 00:34:29 +02:00
Peter 'Pita' Martischka
6587852138 fixed keystroke delete test 2012-10-06 23:38:49 +02:00
Peter 'Pita' Martischka
4c1561fcf6 improve test descriptions 2012-10-06 23:38:17 +02:00
Peter 'Pita' Martischka
35cea1e542 fixed the keystroke_urls_become_clickable.js test 2012-10-06 21:45:46 +02:00
Peter 'Pita' Martischka
7fd23c8d71 ported italic test to the new framework 2012-10-06 21:34:20 +02:00
Peter 'Pita' Martischka
3d96fe3d86 rewrote the testHelper 2012-10-06 21:29:37 +02:00
John McLear
90373964d3 Remove two instances of the same function name
Both functions did the same thing, the first function was buggy.  Might be worth someone looking through the history of this file and pointing out when I made this heinous error ;)
2012-10-06 02:36:51 +02:00
John McLear
db1a1a0e3e Merge pull request #1034 from d-a-n/develop
Added hooks for pad events create/edit/load/remove
2012-10-05 17:28:40 -07:00
johnyma22
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
johnyma22
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
johnyma22
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
johnyma22
66a25adf62 put all scripts back into index 2012-10-04 21:17:16 +01:00
johnyma22
5c54b2c681 attempt to move onClick away from HTML.. This is required 2012-10-04 21:16:58 +01:00
johnyma22
7eecfa17b7 test for basic indent and outdent, needs more work 2012-10-04 21:02:34 +01:00
johnyma22
edc8ff6a41 adding other tests back to index 2012-10-04 20:44:42 +01:00
johnyma22
7f819967f9 a script for testing font change 2012-10-04 20:44:21 +01:00
johnyma22
fa9c5531e9 a test to check teh value of embed links 2012-10-04 20:02:29 +01:00
johnyma22
ff22ae9206 fix keystroke delete test 2012-10-04 19:12:01 +01:00
johnyma22
1466b31c54 slightly uglier UI but still ugly 2012-10-04 19:08:29 +01:00
John McLear
a1280fd917 Merge pull request #1004 from yourcelf/develop
Add `userColor` query param to set initial color
2012-10-04 10:57:16 -07:00
johnyma22
c74aed986e Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests 2012-10-04 18:55:57 +01:00
johnyma22
a97c63b809 Fix issue caused by broken async update 2012-10-04 18:53:02 +01:00
Peter 'Pita' Martischka
07182bb716 Changed the send keys library so that its works with elements inside an iframe 2012-10-04 16:22:05 +02:00
Peter 'Pita' Martischka
95ce0aaba8 merged remote feature/frontend-tests 2012-10-04 14:35:25 +02:00
johnyma22
24988d659c This test should work, Peter, why does this test not work? 2012-10-03 21:55:23 +01:00
johnyma22
38ef46449b add delete stroke test to index page of /tests/frontend 2012-10-03 21:26:48 +01:00
johnyma22
339ee6d2e0 working keystroke delete check 2012-10-03 21:25:31 +01:00
johnyma22
aa41ebcd6d include a sendkeys library to emulate sending keypresses 2012-10-03 21:15:56 +01:00
johnyma22
7820e3eb7c beginning of keystroke test 2012-10-03 20:57:04 +01:00
johnyma22
54a77458d6 clean up helper file 2012-10-03 20:56:52 +01:00
Peter 'Pita' Martischka
7aee98bce8 made test helpers more cross browser compatible 2012-10-03 17:37:48 +01:00
John McLear
66475f32f3 Merge pull request #1003 from Pita/express-v3
Upgrade Express to v3 [proposal]
2012-10-03 06:25:44 -07:00
John McLear
f408d0f9c7 Merge pull request #1038 from cweider/fix-relative
Upgrade to Yajsml bug fix.
2012-10-03 06:16:28 -07:00
d-a-n
a521a12583 Changed pad_id to padID to follow projct standards. 2012-10-03 15:50:43 +03:00
d-a-n
0fd8490ca6 Changed pad_id to padID to follow projct standards. 2012-10-03 15:49:28 +03:00
d-a-n
358e481731 Changed pad hook names to follow naming conventions. Arguments will now be passed as hash. 2012-10-03 13:41:40 +03:00
d-a-n
754c559d63 Changed pad hook names to follow naming conventions. 2012-10-03 13:35:31 +03:00
Marcel Klehr
2684a1d295 Merge branch 'develop' into express-v3
Conflicts:
	src/node/hooks/express/errorhandling.js
2012-10-03 10:09:00 +02:00
Chad Weider
b29fc11e9d Upgrade to Yajsml bug fix. 2012-10-02 19:57:23 -07:00
Richard Braakman
85b44119ae USERINFO_UPDATE: construct a new message for broadcast
The server was reusing the client's message when broadcasting userinfo
updates. This would allow a malicious client to insert arbitrary fields
into a message that the other clients would trust as coming from the
server. For example, adding "disconnect" or renaming other authors.

This commit fixes it by having the server construct a new message with
known fields before broadcasting.
2012-10-02 23:27:30 +03:00
d-a-n
4652751285 Updated docs for new pad hooks (add, edit, remove) 2012-10-02 22:32:30 +03:00
d-a-n
64a3d60b94 Added pad hooks (create, load, edit, remove) 2012-10-02 22:30:13 +03:00
d-a-n
c0f2e557d3 Updated docs for new pad hooks (add, edit, remove) 2012-10-02 22:11:54 +03:00
d-a-n
07c33c77c4 Updated docs for new pad hooks (add, edit, remove) 2012-10-02 22:10:18 +03:00