ilya
d1a2ebd236
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-22 11:56:04 -07:00
ilya
9a217d1fa8
MS IZ request acceptance email
2010-10-22 11:55:50 -07:00
Raphael
7dd86b3c87
Move comment signing spec to comment spec, make encryption spec not depend on message building
2010-10-22 11:18:43 -07:00
Raphael
d8bbe38019
Move spec to request_spec
2010-10-22 11:11:51 -07:00
Raphael
1a19c28199
Move spec to user_spec
2010-10-22 11:10:35 -07:00
Raphael
b404346c40
Stop stubbing signature verification unless it's necessary
2010-10-22 11:01:58 -07:00
Sarah Mei
ffa467b795
more stubbing! yay?
2010-10-22 06:38:46 -07:00
maxwell
6620f33ae2
fixing spec with a mock on mailer
2010-10-22 01:07:57 -07:00
maxwell
5701c3a873
should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now
2010-10-22 00:49:01 -07:00
ilya
80cd4761f3
started the new invitation email
2010-10-22 00:49:01 -07:00
Raphael
41cfd36b19
Refactor user_spec a little
2010-10-21 16:06:47 -07:00
Raphael
fe1a6bce20
Attr-accessible on aspects, check whether built user is persisted
2010-10-21 12:49:50 -07:00
Raphael
705cef3696
Fix comment spec
2010-10-21 10:55:17 -07:00
Raphael
35a830aa03
Fix profile update spec
2010-10-21 10:39:19 -07:00
Sarah Mei
e414b1c553
Fix some comment specs (still one failing). Remove warning from receive spec.
2010-10-21 06:45:15 -07:00
Raphael
bef6d76bfd
Refactor specs a little more
2010-10-20 17:53:09 -07:00
Raphael
e1cdcc68c8
Cut 10 seconds off of visible_posts_spec
2010-10-20 17:48:16 -07:00
Raphael
f9919d1cce
Not calling friend_users until it is needed takes a couple seconds off
2010-10-20 17:43:13 -07:00
ilya
554adeae69
MS IZ; querying through for person not in aspect is tested
2010-10-20 16:39:37 -07:00
ilya
02c0bf3c43
fixed the seed script
2010-10-20 14:52:17 -07:00
ilya
8fddb4ecf5
MS IZ added test concerning people in multiple aspects
2010-10-20 13:19:32 -07:00
ilya
e6de6179e9
MS IZ dependant destroy is back for aspects
2010-10-20 11:47:09 -07:00
ilya
992bd42b55
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
spec/models/aspect_spec.rb
2010-10-20 11:30:06 -07:00
ilya
ea1ab59c3a
MS, IZ finished adding and removing people from aspects methods, refactored the move friend method
2010-10-20 11:28:56 -07:00
Raphael
961510a8ed
Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build.
2010-10-20 11:03:47 -07:00
Raphael
f97f63e2d1
Merge remote branch 'tristil/239-380-identity-error-handling'
2010-10-20 10:36:03 -07:00
Raphael
4986de2c33
Put reloads back in
2010-10-20 10:35:16 -07:00
Raphael
0758f9245f
Clean up specs a little, fix unfriending
2010-10-20 10:28:08 -07:00
Raphael
fd8028db33
Revert "Revert "Merge remote branch 'upstream/master'""
...
This reverts commit 1481056af2 .
2010-10-20 09:51:55 -07:00
ilya
4d1ce410d7
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-20 09:39:32 -07:00
Alec Leamas
1481056af2
Revert "Merge remote branch 'upstream/master'"
...
This reverts commit fb70dc8c99 , reversing
changes made to 53fef63a9a .
Conflicts:
pkg/fedora/diaspora-setup
pkg/ubuntu/diaspora-setup
public/stylesheets/sass/application.sass
spec/models/user/attack_vectors_spec.rb
2010-10-20 14:59:55 +02:00
maxwell
e7f764ffeb
attack vector where you take posts from valid (unknown) diaspora people is now fixed
2010-10-20 00:42:33 -07:00
Raphael
d98ac70155
Clean up some repetition in specs
2010-10-19 23:29:59 -07:00
Raphael
197bd8eb49
make user/receive spec less repetitive
2010-10-19 23:29:59 -07:00
Raphael
74ec629b01
user_friending_spec passes again
2010-10-19 23:29:59 -07:00
Raphael
52f7350f78
Fix a couple more specs
2010-10-19 23:29:59 -07:00
Raphael
43dd95147e
Starting to remove database-cleaner
2010-10-19 23:29:58 -07:00
Sarah Mei
81ef7386b3
validation errors in profile and person bubble up to user.
2010-10-19 22:33:12 -07:00
Joseph Method
4b588ccefb
Addresses [ #380 ] and [ #239 ] by handling the errors from bad identities
2010-10-19 23:44:43 -04:00
ilya
e3ffd2ffe7
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 18:26:06 -07:00
ilya
b31b2de6f5
MS IZ aspect add and delete for a person
2010-10-19 18:25:59 -07:00
Raphael
3557d66749
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 16:07:03 -07:00
Raphael
9309be2d69
Merge branch 'import'
...
Conflicts:
spec/models/user/invite_spec.rb
2010-10-19 16:06:48 -07:00
ilya
24b136bbd9
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 15:42:51 -07:00
ilya
4e9e716783
another attack vector spec
2010-10-19 15:42:40 -07:00
Raphael
2c66bbbe00
Strip profile names, resolve 357
2010-10-19 13:51:31 -07:00
Raphael
962f282cbc
Validate uniqueness of aspect name, 359
2010-10-19 12:23:24 -07:00
Raphael
fce902821b
Remove downcasing of diaspora_handle, verify that diaspora_handle querying and validation is case insensitive.
2010-10-19 11:06:43 -07:00
maxwell
8ada8414c7
username can be any case, but diaspora handle should always, always, ALWAYS be lowercase, for webfinger reasons
2010-10-18 22:55:09 -07:00
ilya
d642928268
invite sends friend request if already friends, and raises if already friends
2010-10-18 16:27:02 -07:00