Commit graph

175 commits

Author SHA1 Message Date
maxwell
a649d18cd7 add tests to see if timestamps are updated on recevie...they are not 2011-02-08 14:07:25 -08:00
Raphael
e890d73de7 Remove mocha 2011-01-26 11:52:14 -08:00
Sarah Mei
0b39359d1c Standardize how we're requiring config/environment 2011-01-23 12:42:09 -08:00
maxwell
72e10cfad6 remove the fixtures everytime, until we actually figure out how to do this right. also clean up some spec helper includes to prevent everything getting included many times 2011-01-18 22:45:43 -08:00
Raphael
6ccf8a4d2d Fixed connecting spec, magic import failure disappearance 2011-01-18 16:05:50 -08:00
Raphael
88ebd14799 Fixture builder working, need to make specs not require a clean db 2011-01-18 14:53:46 -08:00
Raphael
1353929d44 Made specs work with fixtures, spec_helper needs work 2011-01-18 13:31:10 -08:00
Raphael
ac3d037dc4 Comments controller spec using fixtures 2011-01-18 10:48:06 -08:00
Raphael
b580b7bd2c Putting fixtures in specs... 2011-01-18 10:42:50 -08:00
Raphael
fdc9534fc7 Fix specs in the presence of fixture_builder 2011-01-18 10:25:26 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
maxwell
49b172f192 up with convention, down with case. pubsubhubbub now adhears to ruby caseing, rather than its own name weirdness 2011-01-11 15:04:03 -08:00
Raphael
7c3c17a418 Move fantasy_resque to the fake_resque file, add services to the mysql export fixture 2011-01-06 16:34:28 -08:00
Raphael
9ba43b148f Move resque modifications out to spec/support 2011-01-06 12:33:12 -08:00
Raphael
0284f0fd6d Write fixture for mysql export 2011-01-06 12:33:12 -08:00
Raphael
d44e76a6aa Down to 250 failures in mysql 2010-12-20 00:36:48 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
58f757b91d profile_spec is passing with mysql... baby steps. 2010-12-18 18:45:55 -08:00
danielvincent
b1c0facfe6 initiating a request now just creates a pending contact instead of persisting a request 2010-12-14 17:11:43 -08:00
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
Daniel Vincent Grippi
c1a9a89be7 Merge branch 'production' of github.com:diaspora/diaspora into production
Conflicts:
	app/models/user.rb
	config/deploy.rb
	spec/factories.rb
	spec/models/request_spec.rb
	spec/spec_helper.rb
2010-09-14 11:08:18 -07:00
Daniel Vincent Grippi
40ecf176e8 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:26:15 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
b05d106aed Remove user_refs from Person, put pendings in the broken photo specs 2010-09-13 12:16:43 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Raphael
86d9a41d25 send_friend_request_to now takes a person and group, rather than a receive url and a group id 2010-09-09 16:06:42 -07:00
Raphael
5ef442d93f RS, IZ; Socket spec now more realistic, visible_person_by_id fixed 2010-08-27 10:48:14 -07:00
Raphael
94bb754c34 Changed parseing person from xml a little, using it for comments. 2010-08-26 15:06:39 -07:00
ilya
501bcdd197 Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 2010-08-17 23:25:33 -07:00
Raphael
4a4686ce6e refactored signature validation got specs passing 2010-08-17 23:21:00 -07:00
ilya
55b4d4758f Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
	app/models/user.rb
	spec/models/user_spec.rb
2010-08-17 22:58:46 -07:00
Raphael
55d84b3288 Broke up user spec, put user update back in routes 2010-08-17 22:03:45 -07:00
Raphael
842b321dfa User email checking, routes working again 2010-08-17 13:02:42 -07:00
Raphael
ad07521e07 Made a few more tests pass 2010-08-16 16:22:46 -07:00
Raphael
0f596af5c4 Refactored message_queue getting, fixed retraction spec 2010-08-06 13:13:00 -07:00
Raphael
bb66e87905 RS, IZ; Encryption specs now pass with openssl 2010-08-05 11:56:31 -07:00
Raphael
7d7c39e3dc callbacks not running on photo save 2010-07-17 14:09:21 -07:00
Raphael
d8ad4367d5 Tests now pass 2010-07-17 09:32:41 -07:00
Raphael
d7e07dfda8 comment specs fixed, comments now signed by post poster 2010-07-15 14:41:39 -07:00
Raphael
2d5d3a2f2d commit more often 2010-07-15 13:29:21 -07:00
Raphael
f680c4b71e RS, IZ; Signature Verification now stubbed out outside of encryption specs, green 2010-07-14 11:01:21 -07:00
ilya
895742824d Sped up specs, fixed env 2010-07-08 21:23:08 -04:00
ilya
122bbf0cd2 Merging dashboards 2010-07-08 20:56:25 -04:00
ilya
a5db2cd231 Added keyrings to gitignore, symlinked to shared dir in cap scripts 2010-07-08 20:54:20 -04:00
ilya
9e8426ceb4 RS, IZ; Users now have keys, keyring now in db folder 2010-07-08 19:57:10 -04:00
maxwell
db1811eb61 DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket 2010-07-08 14:14:03 -07:00
maxwell
6293f9f585 socket is now a controller 2010-07-08 10:17:41 -07:00
maxwell
58ed75a289 MS socket now works in the server, but I can't figure out how to mock this stuff 2010-07-07 22:20:15 -07:00
maxwell
5350b40e3c broken autotest for rafi 2010-07-07 15:27:22 -07:00
maxwell
b105b0d6f2 merged in 2010-06-25 15:34:40 -07:00
maxwell
5cade230ac added silly debug toggle 2010-06-25 15:33:23 -07:00
ilya
c0167a445a RS, IZ; Ended spec pollution, fixed up blog spec 2010-06-25 18:04:09 -04:00