ilya
ee2d134cb0
receiving spec is green
2010-10-11 19:20:00 -07:00
ilya
03df0ff716
parser spec is green
2010-10-11 18:22:19 -07:00
ilya
bb7e2a9918
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-11 14:58:22 -07:00
ilya
007f6cfb6f
close account
2010-10-11 14:58:11 -07:00
danielvincent
9bfb213465
Merge branch 'invites' of github.com:diaspora/diaspora into invites
2010-10-11 11:52:57 -07:00
Raphael
73e4d2b25b
Pull in search improvement, remove cruft
2010-10-11 11:08:54 -07:00
Raphael
bd6a8a85e2
Add spec for full name searching
2010-10-11 10:46:40 -07:00
Raphael
8cf72441b4
Make intended behavior on hcard action clearer, return 404 on nonexistent person
2010-10-11 10:13:52 -07:00
Raphael
c30155e9a1
Remove outdated photo spec
2010-10-10 15:04:57 -07:00
Sarah Mei
2a24de2ba7
Changing spec to pending because it hasn't been implemented yet
2010-10-10 13:29:03 -07:00
maxwell
fd0902abb4
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-10 11:54:16 -07:00
maxwell
0541833c18
stop the file include madness. using File.join and Rails.root for includes everywhere I could
2010-10-10 11:54:08 -07:00
Sarah Mei
ac85fbcc64
DevUtilitiesControllerSpec runs under 1.9.2.
...
FileUtils.mv with the :force option works under 1.8.7 if the source file doesn't exist, but fails under 1.9.2.
2010-10-10 11:52:19 -07:00
ilya
1ac410b590
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-09 21:44:26 -07:00
ilya
3887712115
slight refactor of receiving spec, wrote a spec that exposed malicious friend attack
...
vector
2010-10-09 21:34:53 -07:00
Sarah Mei
4da2f9cf58
Fix pending spec in SocketsControllerSpec
2010-10-09 21:58:46 -06:00
ilya
ef3e627bed
the users are now made with people
2010-10-08 15:40:42 -07:00
Raphael
6064b2e022
Add a spec, move another to posting
2010-10-08 14:37:22 -07:00
danielvincent
154ec95717
killed the public tab. made a broadcast button in everyone tab
2010-10-08 14:06:49 -07:00
danielvincent
b70cf713ec
removed old pending spec
2010-10-08 09:16:11 -07:00
Sarah Mei
4a88ac22c2
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 02:15:17 -06:00
Sarah Mei
899d82b766
Fix 1 of 2 pending photo specs.
2010-10-08 02:15:07 -06:00
danielvincent
4bb26cfce4
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 00:46:41 -07:00
danielvincent
fab9e8b6eb
cleaned request spec
2010-10-08 00:46:24 -07:00
Sarah Mei
ce9aa3600d
Refactor user friending spec
2010-10-08 01:42:48 -06:00
Sarah Mei
511cd8fa1c
Clean up reloading in user friending spec.
2010-10-08 01:23:33 -06:00
Raphael
3632143959
Take out pending on spec that exposes issue 150
2010-10-07 17:54:26 -07:00
Raphael
1d463d22a1
Person show for a nonexistent person now redirects to people index page, rather than giving a 500
2010-10-07 16:50:19 -07:00
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
danielvincent
0ebb597b72
DG MS; test for users#export
2010-10-07 15:22:03 -07:00
Sarah Mei
b63fb5d7a6
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 15:27:18 -06:00
Sarah Mei
4dba2d7c35
Fix failing spec. Backfill spec for DevUtilitiesController#set_backer_number.
2010-10-07 15:27:04 -06:00
danielvincent
7a3d168123
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 14:17:22 -07:00
Raphael
d7bbb66d27
Run whitespace:cleanup
2010-10-07 10:47:37 -07:00
maxwell
ec4c63ada7
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-05 17:51:10 -07:00
maxwell
d638bdb018
MS IZ password change field is now in edit profile
2010-10-05 17:49:06 -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
danielvincent
f3c34692d8
pubsub support
2010-10-05 13:39:56 -07:00
ilya
7b690f5dcb
slight publics controller spec refactor
2010-10-02 13:20:23 -07:00
ilya
f9cecd9d89
specs are green
2010-10-02 13:03:11 -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
e9521d7144
tiny commit to switch branches
2010-09-29 12:15:54 -07:00
ilya
46bf0cfd99
roundtrip done, just need to clean and move to the new api
2010-09-28 15:11:01 -07:00
ilya
c7d29b29c8
the salmon now encrypts the activity, and stores the aes key in the header
2010-09-28 13:22:19 -07:00
ilya
6eede48f9f
started to refactor the salmon spec, changed data in to be parsed data
...
to be more clear
2010-09-28 12:39:55 -07:00
danielvincent
eac6b8a63b
builder is now a class initialized with a user. added director class.
2010-09-27 21:54:01 -07:00
danielvincent
58b688aa68
fixed builder spec
2010-09-27 21:28:21 -07:00
danielvincent
eb7244e07c
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-27 19:07:01 -07:00
ilya
1225291fc2
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-27 19:01:25 -07:00
danielvincent
26a4dc76a6
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-27 18:34:55 -07:00
danielvincent
3b8ddf76a3
temp route for atom feed. also, public atom currently displays all posts.
2010-09-27 18:34:47 -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
Raphael
6100b318e4
More accurately describe a spec
2010-09-27 18:12:55 -07:00
danielvincent
df800dc87e
ostatus builder
2010-09-27 17:58:44 -07:00
ilya
6e407572c4
removed unused repost method, going through the warden object
2010-09-27 17:27:49 -07:00
Raphael
591347a77a
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-27 16:54:18 -07:00
Raphael
e9f433e12f
Add spec for not overwriting the image_url on profile update
2010-09-27 16:54:08 -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
ilya
8f55852ea9
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-27 15:30:27 -07:00
michael.scheffler
2c55e70067
Replaced hardcoded '@example.com' with APP_CONFIG[:terse_pod_url]
2010-09-28 02:50:56 +08:00
Raphael
1ab536bf04
Merge branch 'master' of http://github.com/sarahmei/diaspora
2010-09-27 11:09:14 -07:00
ilya
98bc2df841
removed the encryption key= method, and user with private key factory
2010-09-27 10:10:54 -07:00
ilya
cf0df90dae
moved the private key into user where it belongs, two failing cucumber tests
2010-09-26 22:08:42 -07: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
Sarah Mei
64e1912c37
Disabled image resizing in specs => 15% faster test suite. FTW
2010-09-26 00:40:40 -07:00
Sarah Mei
17757a2e2d
Merging upstream changes
2010-09-25 15:57:59 -07:00
Stephen Caudill
72cefc6265
Move relationship_flow spec to its helper spec
2010-09-25 13:18:46 -04:00
Stephen Caudill
8c6dff35c0
Remove unnecessary includes
2010-09-25 13:11:44 -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
Sarah Mei
e3ec00595d
Cleaned up file path joining in some of the dev utilties.
...
Backfilled tests where necessary to make sure changes didn't break existing code.
2010-09-25 04:34:48 -07:00
ilya
e414558f79
passing the right things to the partial
2010-09-24 15:52:29 -07:00
Raphael
ae7c869bc3
Add specs for album controller failure
2010-09-24 15:01:36 -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
Steve Conover
5edd054ac7
MS Use class_eval because of some sort of load ordering issue
2010-09-22 22:22:18 -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
50414fef40
Remove unused method from message handler
2010-09-21 11:03:21 -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
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