danielvincent
af9cda52af
DG IZ; always query through the current_user in the controllers.
2010-09-20 13:18:11 -07:00
Michael Sofaer
27c00bae90
MJS RJS Fix initialization of album test
2010-09-19 18:12:42 -07:00
Raphael
60e29f6572
Magent should use the same settings as mongomapper, app config should load first, websocket spec is a little better.
2010-09-19 16:37:34 -07:00
danielvincent
08f833ba7a
case insensitivity on search
2010-09-18 17:21:18 -07:00
Stephen Caudill
81d753e773
Refactor Album spec
...
* use let(!) where appropriate (see [1] for more info).
* use `context` to portray scenarios
* use `describe` to portray method and Class specifications
* omit the word "should" from example descriptions (Dave Chelimsky
remarked to me that it was "tantamount to line-noise" and I'm of the
opinion that it adds no value.
* use more idiomatic Ruby (prefer things like 2.times to 1.upto(2))
* use more idiomatic Rails (prefer 1.minute.from_now to Time.now +
60*60)
* use more idiomatic Rspec (prefer album.should be_valid to
album.valid?.should be_true
* also ensure to only make one assertion per example
Other sundry cleanups.
[1] http://rdoc.info/github/rspec/rspec-core/master/RSpec/Core/Let/ClassMethods#let-instance_method
2010-09-17 16:41:58 -04:00
Raphael
71ac61c01d
Fix websocket specs
2010-09-17 12:49:05 -07:00
Raphael
ce2260b747
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-17 11:57:36 -07:00
Raphael
99ad001d28
Fix websocket spec, take out puts in by_webfinger
2010-09-17 09:52:31 -07:00
Raphael
2e8ecceaf7
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-16 21:53:34 -07:00
Raphael
7c02200a67
Finish moving out websocket server, add task to start it
2010-09-16 21:42:16 -07:00
danielvincent
25b4b409be
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-16 16:19:48 -07:00
danielvincent
cbb692b6a3
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-16 16:06:28 -07:00
danielvincent
0c7ba49e34
DG IZ; aspect deletion
2010-09-16 16:03:18 -07:00
Federico Brubacher
05808456d8
fixed small issue in albums#update anad added corressponding controller test
2010-09-16 12:21:08 -03:00
Raphael
1e646fb0a9
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-15 23:54:57 -07:00
Raphael
d760725145
Don't webfinger another server on receiving a webfinger request
2010-09-15 23:01:13 -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
33048fe6db
Merge branch 'master' of github.com:diaspora/diaspora into production
...
Conflicts:
app/models/user.rb
spec/models/aspect_spec.rb
2010-09-15 17:24:00 -07:00
Raphael
01d26f6d0e
Using custom registrations controller
2010-09-15 17:05:21 -07:00
Daniel Vincent Grippi
ee89bfaf8f
removed do bad things
2010-09-15 16:18:33 -07:00
maxwell
8828707c45
MS fixed the login bug, deploying to master
2010-09-15 15:15:15 -07:00
maxwell
c57f6b2d9a
fixing merge
2010-09-15 13:29:39 -07:00
maxwell
84c60e5f2e
DG MS fixing webfinger, i hope to goodness
2010-09-15 13:28:06 -07:00
Daniel Vincent Grippi
a925c14310
fixing webfinger/salmon
2010-09-15 12:35:23 -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
Daniel Vincent Grippi
426d038aaf
Remove email based filter
2010-09-14 11:22:32 -07:00
Daniel Vincent Grippi
7643fb4125
remember that aspects are seeded
2010-09-14 11:15:10 -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
b2b60af8aa
Albums_by_aspect now takes :all
2010-09-13 17:32:29 -07:00
Daniel Vincent Grippi
1b92bcd17c
Add albums_by_aspect method to user
2010-09-13 17:26:24 -07:00
Daniel Vincent Grippi
84b29770fe
Put raise back in webfinger fail
2010-09-13 16:05:43 -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
9837340eb2
Rename files from group to aspect
2010-09-13 10:43:15 -07:00
Raphael
44a1f82da9
Rename group to aspect
2010-09-13 10:38:38 -07:00
Raphael
4922ebd84c
Finish removing encryption from retractions
2010-09-10 16:14:37 -07:00
Raphael
a44d40168a
Encryption removed from everything other than comments, most irrelevant specs removed
2010-09-10 16:04:09 -07:00
Raphael
aa1f3c6438
Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file
2010-09-10 10:31:23 -07:00
Raphael
68dc74e0b7
Tests pass again, use id => in retraction.perform
2010-09-09 18:15:30 -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
fd61535e11
Hcards working
2010-09-09 15:43:16 -07:00
