Raphael
bc5dc934d6
Speed up importer spec by 40 seconds
2010-10-29 18:08:36 -07:00
maxwell
15bd24a64f
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
spec/lib/message_handler_spec.rb
spec/spec_helper.rb
2010-10-29 16:23:33 -07:00
maxwell
c1c045a4cd
mocking
2010-10-29 16:21:39 -07:00
Raphael
99eb25762d
Moving to make_user, a few specs broken
2010-10-29 15:53:21 -07:00
maxwell
3ce44d040f
mocking out emhttprequest everywhere
2010-10-29 15:16:11 -07:00
maxwell
7e7c4c3431
refactored message handler spec
2010-10-29 14:26:11 -07:00
maxwell
c6fbcd28f7
stubbing out the hub publish method
2010-10-29 12:09:10 -07:00
maxwell
23db4fe278
merge complete
2010-10-29 11:33:31 -07:00
maxwell
39f66cc5d9
tests are green
2010-10-29 11:19:07 -07:00
maxwell
7c32649df4
rebasing master
2010-10-29 11:18:20 -07:00
maxwell
1b48572674
MS tests are now green
2010-10-29 11:16:50 -07:00
maxwell
68a44af856
making a few more cleanup and tests
2010-10-29 11:13:08 -07:00
maxwell
eddcb71fcb
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:11:05 -07:00
maxwell
9a2e3ef158
making a few more cleanup and tests
2010-10-29 11:05:17 -07:00
maxwell
8fe339b03b
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:05:17 -07:00
zhitomirskiyi
f484eb957f
comments now don't imbed the person in the xml
2010-10-28 12:13:39 -07:00
zhitomirskiyi
e776389d19
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
2010-10-26 11:19:50 -07:00
zhitomirskiyi
917d1838de
MS IZ specs are green
2010-10-25 18:55:51 -07:00
maxwell
b17ae0bf38
DG MS removed unused fb_status model and respective specs, fixtures.
2010-10-25 12:26:08 -07:00
ilya
8d61fb0aeb
tiny bug in the spec
2010-10-24 01:45:26 -07:00
ilya
7083d2aa03
Moving friendships into a 'Contact' proxy object.
2010-10-22 18:11:04 -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
b67cee9af0
Trying to make spec directory structure the same as the lib and app structures
2010-10-22 11:09:20 -07:00
Raphael
61d539e555
Moving user_encryption_spec to lib
2010-10-22 11:06:31 -07:00
Sarah Mei
7e4529f2bd
im in ur test stubbin ur mailers
2010-10-22 06:22:47 -07:00
Raphael
abf27bbfb2
Take unused models out of webhooks spec
2010-10-20 17:43:13 -07:00
Raphael
ff3666df5e
Cut parser spec time by a couple seconds
2010-10-20 17:43:13 -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
Alec Leamas
1481056af2
Revert "Merge remote branch 'upstream/master'"
...
This reverts commit fb70dc8c9953fef63a9a
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
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
Raphael
360891496e
Check that time serializes correctly post-parse, not on string equality
2010-10-19 17:09:52 -07:00
maxwell
733fb3b68e
dump typo in spec
2010-10-14 23:12:44 -07:00
maxwell
0f75072477
make import spec pending with diaspora handle bug
2010-10-14 23:03:23 -07:00
maxwell
11925ded2b
moving branches
2010-10-14 19:15:32 -07:00
maxwell
d61a227fc7
posts now serialize their created_at time
2010-10-14 16:49:08 -07:00
maxwell
6ef1780008
removing pointless pending spec
2010-10-13 23:20:25 -07:00
maxwell
04f6cdaacf
MS DG; basic view support; it works, but it is ugly
2010-10-13 18:42:24 -07:00
maxwell
a86d965079
DG MS; importer now takes params for username, password, and diaspora handle
2010-10-13 17:07:16 -07:00
maxwell
f04934cbae
DG MS; ensure aspect post_ids are only for user
2010-10-13 16:54:18 -07:00
maxwell
b395208a51
DG MS; added more stuff to importer.
2010-10-13 16:42:27 -07:00
maxwell
2c40fa5ebf
DG MS; spec for clean_aspects
2010-10-13 13:32:22 -07:00
maxwell
637a79a99d
DG MS; spec for clean_aspects
2010-10-13 13:28:10 -07:00
maxwell
55227f3f72
DG MS; filter_post method, aspect_clean method
2010-10-13 13:10:08 -07:00
danielvincent
0315869a24
all specs should pass again after merge
2010-10-13 09:43:58 -07:00
danielvincent
59c3be41b3
Merge branch 'master' of github.com:diaspora/diaspora into import
2010-10-13 09:21:27 -07:00
