Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/models/user_spec.rb')
-rw-r--r--spec/models/user_spec.rb10
1 files changed, 2 insertions, 8 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index e86b89e52..315484ab9 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -5,9 +5,9 @@
require 'spec_helper'
describe User do
- let(:user) { Factory(:user) }
+ let(:user) { make_user }
let(:aspect) { user.aspect(:name => 'heroes') }
- let(:user2) { Factory(:user) }
+ let(:user2) { make_user }
let(:aspect2) { user2.aspect(:name => 'stuff') }
it 'should have a key' do
@@ -188,12 +188,6 @@ describe User do
end
end
- describe '#diaspora_handle' do
- it 'uses the pod config url to set the diaspora_handle' do
- user.diaspora_handle.should == user.username + "@" + APP_CONFIG[:terse_pod_url]
- end
- end
-
context 'profiles' do
it 'should be able to update their profile and send it to their friends' do
updated_profile = {