Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
Raphael
d7bbb66d27
Run whitespace:cleanup
2010-10-07 10:47:37 -07:00
Stoyan Gaydarov
dbacff250a
added extra user spec
2010-10-06 08:27:25 +08:00
Stoyan Gaydarov
9eb8fe0c5a
use the correct pod url in the user spec
2010-10-06 08:27:25 +08:00
ilya
7b690f5dcb
slight publics controller spec refactor
2010-10-02 13:20:23 -07:00
ilya
7dcde292e1
user posting spec is now green, now stubbing on the apropriate method
2010-10-02 12:34:16 -07:00
ilya
b6a912dd02
slowly getting specs to pass on with the new api
2010-09-30 15:17:53 -07:00
ilya
7852c346f2
mode the visible posts api more general and moved to it on the public controller
2010-09-27 18:31:37 -07:00
ilya
6e407572c4
removed unused repost method, going through the warden object
2010-09-27 17:27:49 -07:00
ilya
08b9aa864a
Merge branch 'master' of github.com:diaspora/diaspora into fb
...
Conflicts:
app/views/layouts/application.html.haml
app/views/shared/_publisher.haml
app/views/shared/_sub_header.haml
app/views/users/edit.html.haml
config/deploy_config.yml
config/routes.rb
2010-09-27 15:39:50 -07:00
michael.scheffler
2c55e70067
Replaced hardcoded '@example.com' with APP_CONFIG[:terse_pod_url]
2010-09-28 02:50:56 +08:00
Sarah Mei
68a8ecb05f
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-26 13:08:56 -07:00
Sarah Mei
5d1afe21be
Refactor user specs to speed up spec runs.
2010-09-26 13:08:30 -07:00
Sarah Mei
0ec074be6d
Remove annoying deprecation warning from spec runs
...
Add spec for validation hook
2010-09-26 10:00:29 -07:00
Dorian
6ffc03a4c9
Big clean up: delete trailing whitespace
2010-09-26 12:48:40 -04:00
Stephen Caudill
536cea5e44
Remove consecutive empty lines
2010-09-25 12:06:39 -04:00
Stephen Caudill
821643deb9
Use the new style of spec_helper require
2010-09-25 11:27:59 -04:00
ilya
e414558f79
passing the right things to the partial
2010-09-24 15:52:29 -07:00
ilya
bb58678556
added a fb_status model & parser method
2010-09-24 14:41:31 -07:00
Raphael
950c6a7cab
Merge branch '1.9.2' into HEAD
...
Conflicts:
app/models/photo.rb
2010-09-24 14:36:00 -07:00
Raphael
19199dabfe
fix spec_helper for 1.9.2
2010-09-24 11:49:30 -07:00
Raphael
ed6df7d1bf
Delete user.terse_url
2010-09-23 10:24:10 -07:00
danielvincent
e9d16cc09b
DG IZ; cleanup
2010-09-22 15:48:50 -07:00
danielvincent
6dd7911c8c
DG IZ; update_or_repost
2010-09-22 10:52:29 -07:00
danielvincent
4c0dc58458
spec cleanup
2010-09-21 20:02:37 -07:00
danielvincent
4a3bfea1ba
DG MS; cleaned spec
2010-09-21 17:43:46 -07:00
danielvincent
03638ee68e
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-21 16:35:25 -07:00
danielvincent
107c05ef6f
DG MS; validate_aspect_permissions broken out of post method
2010-09-21 16:35:18 -07:00
ilya
394bf1acb5
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/models/user.rb
spec/models/user_spec.rb
2010-09-21 16:15:01 -07:00
ilya
efd901dcd9
RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG
2010-09-21 15:46:57 -07:00
danielvincent
44db21ffd4
DG MS; cleaned up spec
2010-09-21 15:41:29 -07:00
Raphael
8dd11c0c95
Add a couple specs to friending
2010-09-20 16:41:03 -07:00
danielvincent
5bb4ee5d36
DG IZ; posting now ensures aspect ownership.
2010-09-20 15:15:37 -07:00
danielvincent
af9cda52af
DG IZ; always query through the current_user in the controllers.
2010-09-20 13:18:11 -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
danielvincent
25b4b409be
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-16 16:19:48 -07:00
danielvincent
0c7ba49e34
DG IZ; aspect deletion
2010-09-16 16:03:18 -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
84c60e5f2e
DG MS fixing webfinger, i hope to goodness
2010-09-15 13:28:06 -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
3a468a9f1b
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-14 11:45:33 -07:00