Skip to content
Extraits de code Groupes Projets
Valider 1075c4f9 rédigé par zhitomirskiyi's avatar zhitomirskiyi
Parcourir les fichiers

Merge branch 'master' of github.com:diaspora/diaspora

parents 0e2c20d8 ff13cad1
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -7,12 +7,16 @@ require 'spec_helper' ...@@ -7,12 +7,16 @@ require 'spec_helper'
describe User do describe User do
let!(:user) { Factory(:user) } let!(:user) { Factory(:user) }
let!(:user2) { Factory(:user) }
let!(:aspect) { user.aspect(:name => 'heroes') } let!(:aspect) { user.aspect(:name => 'heroes') }
let!(:aspect1) { user.aspect(:name => 'other') } let!(:aspect1) { user.aspect(:name => 'other') }
let!(:user2) { Factory(:user) }
let!(:aspect2) { user2.aspect(:name => 'losers') } let!(:aspect2) { user2.aspect(:name => 'losers') }
let!(:service1) { s = Factory(:service, :provider => 'twitter'); user.services << s; s }
let!(:service2) { s = Factory(:service, :provider => 'facebook'); user.services << s; s }
describe '#validate_aspect_permissions' do describe '#validate_aspect_permissions' do
it 'requires an aspect' do it 'requires an aspect' do
proc { proc {
...@@ -44,11 +48,26 @@ describe User do ...@@ -44,11 +48,26 @@ describe User do
aspect.reload aspect.reload
aspect.posts.should include album aspect.posts.should include album
end end
it "should add the post to that user's visible posts" do it "should add the post to that user's visible posts" do
status_message = user.post :status_message, :message => "hi", :to => aspect.id status_message = user.post :status_message, :message => "hi", :to => aspect.id
user.reload user.reload
user.raw_visible_posts.include?(status_message).should be true user.raw_visible_posts.include?(status_message).should be true
end end
it "posts to services if post is public" do
message = "hello, world!"
user.should_receive(:post_to_twitter).with(service1, message).exactly(1).times
user.should_receive(:post_to_facebook).with(service2, message).exactly(1).times
user.post :status_message, :message => message, :to => "all", :public => true
end
it "does not post to services if post is not public" do
user.should_receive(:post_to_twitter).exactly(0).times
user.should_receive(:post_to_facebook).exactly(0).times
user.post :status_message, :message => "hi", :to => "all"
end
end end
describe '#update_post' do describe '#update_post' do
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter