Raphael
2c141baf78
Capitalization...
2010-12-10 12:12:34 -08:00
Raphael
4bb9370c5d
Correctly stub the websocket redis method
2010-12-10 11:53:18 -08:00
Raphael
36e1fb8b2c
Fix a couple local-posting specs
2010-12-04 23:38:31 -08:00
Michael Sofaer
9e575ea765
MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues
2010-12-04 19:36:22 -08:00
danielvincent
4c4f5c6aa4
dispatch moved to resque. one failing test, globally stubbed out resque enqueue temporarily. TO AMEND.
2010-12-04 19:36:22 -08:00
danielvincent
d1ad2efed1
HttpPost job now follows redirects
2010-12-04 15:23:54 -08:00
Sarah Mei
713c98ce51
don't require redis for cucumber
2010-12-03 20:49:41 -08:00
maxwell
0a831cfbf4
invites are now on the queue
2010-12-03 19:33:54 -08:00
danielvincent
f9e4a744a5
put spec helper methods in spec_helper
2010-12-03 15:50:17 -08:00
Raphael
8798f05ff7
Revert "Revert redis merge to fix bugs on master"
...
This reverts commit 30698d674b .
2010-12-02 15:33:26 -08:00
Raphael
30698d674b
Revert redis merge to fix bugs on master
2010-12-02 15:20:27 -08:00
Raphael
cee5e4c26e
Bring in resque recipes and rake tasks
2010-12-02 12:35:26 -08:00
maxwell
75caecc6a3
reset to local to english in tests
2010-12-01 12:16:21 -08:00
Raphael
fcb0e07dd7
Stop regenerating fixtures on every spec run
2010-11-29 23:22:49 -08:00
Raphael
a85f47041a
This file is generated by rake fixtures:users
2010-11-24 14:07:00 -05:00
zhitomirskiyi
d793bdc3c7
inital commit for mailqueue
2010-11-05 11:46:43 -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
Raphael
5b78a31d29
make_user now makes a user from fixtures
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
1b48572674
MS tests are now green
2010-10-29 11:16:50 -07:00
maxwell
8fe339b03b
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:05:17 -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
zhitomirskiyi
8acdf21234
MS IZ got rid of the requests for me scope in the user
2010-10-26 14:49:37 -07:00
ilya
637d35d673
Remove puts
2010-10-22 12:27:28 -07:00
Raphael
b404346c40
Stop stubbing signature verification unless it's necessary
2010-10-22 11:01:58 -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 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
Raphael
d3d0182164
Put database cleaner back in
2010-10-19 23:29:59 -07:00
Raphael
43dd95147e
Starting to remove database-cleaner
2010-10-19 23:29:58 -07:00
ilya
9727b356e1
the invitations add requests which are now correctly auto accepted
2010-10-15 17:20:04 -07:00
ilya
03df0ff716
parser spec is green
2010-10-11 18:22:19 -07:00
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
Sarah Mei
64e1912c37
Disabled image resizing in specs => 15% faster test suite. FTW
2010-09-26 00:40:40 -07:00
Stephen Caudill
536cea5e44
Remove consecutive empty lines
2010-09-25 12:06:39 -04:00
Raphael
19199dabfe
fix spec_helper for 1.9.2
2010-09-24 11:49:30 -07:00
Raphael
71ac61c01d
Fix websocket specs
2010-09-17 12:49:05 -07:00
Raphael
c67a8ea100
Merge branch 'master' of github.com:diaspora/diaspora into production
...
Conflicts:
config/deploy.rb
config/environments/production.rb
spec/models/request_spec.rb
2010-09-15 22:37:05 -07:00
Jamie Wilkinson
fbdd50172d
Cleanup stray whitespace
2010-09-16 10:07:59 +08:00
Raphael
de93fd2818
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-15 18:10:13 -07:00
Raphael
708e9f88a5
Spell our own name right
2010-09-15 17:56:18 -07:00
Raphael
1006e8a680
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-15 11:01:11 -07:00
Raphael
aa3ebe372c
License notices replaced
2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
8647220328
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-14 20:44:47 -07:00
ilya
0560b46080
MS IZ added friend redirect, and moved the webfinger responces to fixture directory
2010-09-14 11:58:40 -07:00
Daniel Vincent Grippi
3a468a9f1b
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-14 11:45:33 -07:00
ilya
2311c33626
MS IZ mocked all the webrequest tests
2010-09-14 11:13:58 -07:00