danielgrippi
91e649977c
MS DG update copyright
2011-09-14 11:23:12 -07:00
Raphael Sofaer
c7331230bc
Revert "Revert "Revert "remove uploaded test images after running the specs/cucumber"" -- using == now instead of ="
...
This reverts commit b11bd23da2 .
2011-08-18 12:06:04 -07:00
danielgrippi
b11bd23da2
Revert "Revert "remove uploaded test images after running the specs/cucumber"" -- using == now instead of =
...
This reverts commit 7969b52035 .
2011-08-18 11:20:49 -07:00
danielgrippi
7969b52035
Revert "remove uploaded test images after running the specs/cucumber"
...
This reverts commit a6eb275c7a .
2011-08-18 11:11:08 -07:00
danielgrippi
a6eb275c7a
remove uploaded test images after running the specs/cucumber
2011-08-18 11:08:57 -07:00
Raphael Sofaer
1af945de11
Merge branch 'master' into oauth
...
Conflicts:
Gemfile
Gemfile.lock
app/models/app_config.rb
app/models/post.rb
db/schema.rb
public/stylesheets/sass/application.sass
spec/lib/webfinger_spec.rb
2011-06-28 17:13:38 -07:00
Raphael Sofaer
e8552fc417
Fix direct query execution issues in PG by using select_values/select_rows instead of execute.
2011-06-22 14:47:59 -07:00
Raphael Sofaer
c12103aed9
Deal with ids from PG coming out as strings
2011-06-19 16:16:31 +02:00
Raphael Sofaer
ee75426963
Add failing spec for being overloaded with updated pending photos
2011-06-01 14:05:25 -07:00
Raphael Sofaer
38289b1a47
Multi-server integration tests are now possible
2011-05-25 15:16:14 -07:00
Raphael Sofaer
70fd2e916a
Update rspec
2011-05-13 17:52:37 -07:00
Maxwell Salzberg
cd4c792908
clear tmp image uploads after you run tests
2011-05-13 14:34:45 -07:00
Arzumy MD
3767cce149
moved render_views out of controller specs to spec_helper.
...
cleaned up indentation and spacing in controller specs.
2011-05-07 18:38:40 +08:00
Raphael Sofaer
080f08187d
Disable typhoeus everywhere but the HTTPMulti specs
2011-04-11 14:52:21 -07:00
danielgrippi
914e35dcad
stub hydra for great success. also, make local_luke, local_leia, and remote_raphael fixtures.
2011-04-08 18:24:02 -07:00
Raphael Sofaer
2b997e70c2
Refactor image processing to use 2 uploaders. Federation and s3 need testing
2011-03-21 16:40:53 -07:00
danielgrippi
20f5105e5d
breaking out Diaspora::Taggable wip
2011-03-15 13:21:36 -07:00
Raphael Sofaer
05f9d79689
Fix public posts page when signed in
2011-03-10 15:26:55 -08:00
Raphael Sofaer
435451bc5b
admins can resend invitations
2011-03-03 16:59:33 -08:00
Raphael Sofaer
68f0f7ec21
Add rcov task
2011-03-01 18:12:42 -08:00
Raphael Sofaer
8a4ca3af0e
fix error on account deletion
2011-02-28 11:24:31 -08:00
Sarah Mei
ad141bc5a2
rm -f the fixture builder yml file, to avoid the no-such-file warnings.
2011-02-20 01:17:28 -08:00
Sarah Mei
ee8796fc79
I should know better than to commit after midnight when I'm soloing.
...
(Let's require the support files in the right order.)
2011-02-20 01:08:13 -08:00
Sarah Mei
dc499293b3
Took 90 seconds off the build. Fixture builder FTFW.
...
Cleaned up spec_helper - moved stuff into support files.
2011-02-20 00:35:51 -08:00
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