Commit graph

5042 commits

Author SHA1 Message Date
zhitomirskiyi
ddf95e2750 couple more passing cucumber stories, changed the queries on request and notification 2010-12-28 19:14:47 -08:00
Raphael
4fec1bf717 1 failure left in mysql specs 2010-12-28 11:38:26 -08:00
zhitomirskiyi
be9101b51f Merge branch 'mysql' of github.com:diaspora/diaspora into mysql 2010-12-27 22:23:58 -08:00
zhitomirskiyi
11153cf2ca a couple more passing specs 2010-12-27 22:23:41 -08:00
Sarah Mei
787d550a1f Fix StatusMessagesController. Refactor specs to take out stuff that's tested elsewhere. MOAR REFAKTRNG PLZ. Is ugly. 2010-12-27 21:48:51 -08:00
Raphael
3d7d8b51d2 Add a spec to user, fix a cucumber step for mysql 2010-12-26 21:05:48 -08:00
Raphael
5a1bd13831 Fix a couple more specs in mysql 2010-12-26 20:52:15 -08:00
Raphael
34b5566333 Merge branch 'mysql' of github.com:diaspora/diaspora into mysql 2010-12-26 20:37:28 -08:00
Raphael
a6dcaa2327 Photo specs passing, 9 failures left in mysql 2010-12-26 20:33:21 -08:00
Raphael
3e7e99831a 14 failures after updating mysql branch to master 2010-12-26 17:25:07 -08:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
MrZYX
dbccb6d0de updated locales 2010-12-26 22:26:55 +01:00
Jonne Hass
647c02d38d updated danish locale - thanks Halfdan Mouritzen & friends 2010-12-26 22:13:40 +01:00
Sarah Mei
0e2fa40539 cucumber not quite as jacked on mysql 2010-12-26 12:46:48 -08:00
MrZYX
74b5281a75 Merge branch '761-aspect-name-double-escaped-in-page-title' of https://github.com/Dorian/diaspora into dorian 2010-12-26 21:44:04 +01:00
MrZYX
f92eb1735f Merge branch '756-status-not-formatted-in-photo-page' of https://github.com/Dorian/diaspora into dorian 2010-12-26 21:43:23 +01:00
Dorian
346217ea46 Bug #761 : Aspect name double escaped in page title 2010-12-26 03:59:15 +01:00
Dorian
89ce11456a Markdownify message in photo page 2010-12-26 03:06:19 +01:00
Dorian
b348f094ab Test for XSS in comment 2010-12-26 02:16:53 +01:00
Dorian
d6e72cd2bb Escape person.name in comment 2010-12-26 02:16:53 +01:00
danielvincent
3e9cce2a4b bigger avatars in stream. 2010-12-25 19:32:48 -05:00
danielvincent
7827968b52 removing <p> from statusmessage partial 2010-12-25 19:18:42 -05:00
danielvincent
0fb102a2ec right/left arrow keys functional on photo#show 2010-12-25 19:14:24 -05:00
danielvincent
30dd11b9fa mark notifications as read and update badge 2010-12-25 16:27:09 -05:00
danielvincent
4ff9622bfc notifications now properly socket (not a hack through comments like before). notification badge updates on new messages. 2010-12-25 16:07:31 -05:00
MrZYX
8b29e99cf8 updated locales 2010-12-25 15:22:43 +01:00
Sarah Mei
de502bf67c Convert aspect-edit-spec.js to use actual DOM fixtures generated by AspectsControllerSpec. 2010-12-24 18:39:20 -08:00
Sarah Mei
d0774022b0 adding file for terminitor: automatic terminal-opening utility 2010-12-24 17:29:10 -08:00
Sarah Mei
a1ea193fb9 Methods to generate jasmine fixtures in controller specs, and methods to load those fixtures in jasmine specs. 2010-12-24 16:08:45 -08:00
Michael Sofaer and Raphael Sofaer
7175200779 Fix a spec, need to move to a computer with firefox. 2010-12-24 15:17:24 -08:00
Sarah Mei
9c50f900ed Merry Christmas! I got you someting green.
Remove callback to decrementRequestCounter in aspect-edit.js, since we don't have a request counter on that page anymore. The callback was failing, so the ajax request was never officially completing. Cucumber hates that.
I am going to add jasmine fixture generation in the controller specs, so that next time, a jasmine test will fail in this situation.
Also: clean up manages_aspects.feature.
2010-12-24 14:14:24 -08:00
Michael Sofaer and Raphael Sofaer
30d60021f4 11 Controller specs remain in mysql. ALMOST DONE 2010-12-24 14:12:55 -08:00
Sarah Mei
a13136a4dc Clean up first_user rake tasks; create add_user rake task 2010-12-24 13:46:25 -08:00
Sarah Mei
5ae16c15a3 Fix bug in :pod_uri generation. 2010-12-24 13:00:06 -08:00
Sarah Mei
1f67cc2485 Replace APP_CONFIG with lib/app_config.rb so that it's testable. 2010-12-24 12:31:09 -08:00
Sarah Mei
aeaabd29f1 run specs before cucumber in default rake task 2010-12-24 10:41:20 -08:00
Michael Sofaer and Raphael Sofaer
82b226712f Posting spec green 2010-12-24 09:58:11 -08:00
MrZYX
6ba2e0b68d Merge branch '760-XSS-with-person-name' of https://github.com/Dorian/diaspora into Dorian-760-XSS-with-person-name 2010-12-24 15:56:00 +01:00
Dorian
5cbccda33a Spec for not allowing user to do the XSS 2010-12-24 15:49:26 +01:00
MrZYX
2f135f2579 updated locales 2010-12-24 15:41:54 +01:00
Dorian
293445225a Don't let user put HTML in alt and title image attribute of avatar 2010-12-24 15:33:04 +01:00
Michael Sofaer and Raphael Sofaer
331e6645c6 Just don't use count with select DISTINCT 2010-12-24 00:31:36 -08:00
Michael Sofaer and Raphael Sofaer
426651d827 Fixed a few more specs, having trouble getting AR to return the count of distinct (once for all aspects a post is visible in) posts a user can see 2010-12-24 00:23:37 -08:00
Michael Sofaer and Raphael Sofaer
22a5832c01 Fix retraction related failures in mysql 2010-12-23 23:04:04 -08:00
zhitomirskiyi
7796776135 vimeo works, does not yet fetch the title 2010-12-23 15:36:29 -08:00
Michael Sofaer and Raphael Sofaer
44093c9342 Status message spec now passes 2010-12-23 12:56:49 -08:00
MrZYX
07a074edb6 updated locales 2010-12-23 14:50:20 +01:00
Sarah Mei
2b7eeffd5b Fix searching in mysql. It now does one query for all tokens. And person_spec is green! 2010-12-22 22:24:04 -08:00
Raphael
924bcca0e2 Isolated problem in status message marshalling, mysql 2010-12-22 21:34:45 -08:00
Raphael
d01fbeac04 33 failures left in mysql 2010-12-22 16:37:41 -08:00