nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3215 commits 4 branches 0 tags 121 MiB
Commit graph

402 commits

Author SHA1 Message Date
Sarah Mei
798d904e7e strip username on create 2010-10-16 23:27:18 -07:00
Sarah Mei
d25847a626 Error message for duplicate email; add email validation spec. 2010-10-16 22:46:13 -07:00
Sarah Mei
83b23a0ffe Error message for duplicate username; refactor User validation specs. 2010-10-16 22:36:26 -07:00
Sarah Mei
d3a62c7a45 RegistrationsController#create deals with validation errors. Username, email, password now required on sign-up. 2010-10-16 22:02:51 -07:00
maxwell
4d3da589df make the invite test pending until it doesnt take 300 seconds to run 2010-10-16 11:30:14 -07:00
ilya
6a4b21753e removed the random duplicated line 2010-10-15 17:28:11 -07:00
ilya
9727b356e1 the invitations add requests which are now correctly auto accepted 2010-10-15 17:20:04 -07:00
ilya
2c9c4b0e14 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	app/views/invitations/_new.haml
 2010-10-15 14:36:49 -07:00
maxwell
341009e20f Merge branch 'master' of github.com:diaspora/diaspora into maxwell 
Conflicts:
	Gemfile
	Gemfile.lock
	spec/models/user/invite_spec.rb
 2010-10-14 23:02:06 -07:00
ilya
4a7c4e0848 requests are made on invite but perhaps they should be made on signup so that we have a person 2010-10-14 18:12:18 -07:00
maxwell
a30a2666c6 merging 2010-10-14 16:32:37 -07:00
Raphael
d66c1e70bc Merge remote branch 'bigbash/280-bug-fix' 2010-10-14 13:21:50 -07:00
Sarah Mei
007b06c8ea Stub ::Devise.mailer for great justice. And/or fewer strange arity errors. 2010-10-14 00:26:07 -07:00
maxwell
adbc4dddbc added pending spec for aspect removal on account deletion 2010-10-14 00:12:00 -07:00
maxwell
e218ab6780 Merge branch 'master' of github.com:diaspora/diaspora into import 
Conflicts:
	app/controllers/users_controller.rb
 2010-10-13 23:09:48 -07:00
ilya
d0c6f12ea8 added another attack vector spec 2010-10-13 18:43:22 -07:00
ilya
f82f241932 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-13 16:53:17 -07:00
ilya
36b9f66f60 the invited user keeps track of who invited them, limit on invites, 
removed the invites controller test
 2010-10-13 16:52:33 -07:00
maxwell
b395208a51 DG MS; added more stuff to importer. 2010-10-13 16:42:27 -07:00
Raphael
3fb2ee6e1b adding spec for password confirmation fail 2010-10-13 16:28:56 -07:00
ilya
3b8998ab71 Invitations contains the inviters 2010-10-13 13:29:45 -07:00
Shawn McGuire
5c26b895f2 Fixed trailing whitespace bug 2010-10-13 14:39:04 -05:00
Shawn McGuire
711dcdc5f4 Issue #280 Fixed trailing whitespace error 2010-10-13 14:36:03 -05:00
Sarah Mei
56c6688c81 Take out reloads so specs run on 1.9.2 2010-10-12 20:54:00 -07:00
ilya
0896052b80 remote comment spec, which passed surprisingly, the comment contains the person 2010-10-12 15:31:54 -07:00
ilya
a068ee532d almost all green 2010-10-12 11:17:29 -07:00
ilya
a955dd308e user_friending_spec green, did a slight refactor need more 2010-10-12 10:25:43 -07:00
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
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
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
ilya
3887712115 slight refactor of receiving spec, wrote a spec that exposed malicious friend attack 
vector
 2010-10-09 21:34:53 -07: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
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
Daniel Vincent Grippi
426d038aaf Remove email based filter 2010-09-14 11:22:32 -07:00