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 |
|
Raphael
|
99eb25762d
|
Moving to make_user, a few specs broken
|
2010-10-29 15:53:21 -07:00 |
|
Raphael
|
5b78a31d29
|
make_user now makes a user from fixtures
|
2010-10-29 15:53:21 -07:00 |
|
Raphael
|
0c434ff66a
|
rake task to generate user fixtures, helper method which saves them
|
2010-10-29 15:53:21 -07:00 |
|
maxwell
|
3ce44d040f
|
mocking out emhttprequest everywhere
|
2010-10-29 15:16:11 -07:00 |
|
zhitomirskiyi
|
a5099bb89f
|
IZ moved methods found in spec helper to helper methods file. now we can include them in the db scripts to keep friending behavior in sync
|
2010-10-27 10:32:09 -07:00 |
|