From e1cdcc68c893cc82e6422d185d115fe13f02dd3f Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Wed, 20 Oct 2010 17:26:43 -0700
Subject: [PATCH] Cut 10 seconds off of visible_posts_spec
---
spec/models/user/visible_posts_spec.rb | 146 ++++++++++++-------------
1 file changed, 67 insertions(+), 79 deletions(-)
diff --git a/spec/models/user/visible_posts_spec.rb b/spec/models/user/visible_posts_spec.rb
index 1eaf17ddef..c14927a4bb 100644
--- a/spec/models/user/visible_posts_spec.rb
+++ b/spec/models/user/visible_posts_spec.rb
@@ -5,115 +5,103 @@
require 'spec_helper'
describe User do
- let!(:user) { Factory(:user_with_aspect) }
- let!(:first_aspect) { user.aspects.first }
- let!(:second_aspect) { user.aspect(:name => 'losers') }
let!(:user2) { Factory(:user_with_aspect) }
- let!(:user3) { Factory(:user_with_aspect) }
- let!(:user4) { Factory(:user_with_aspect) }
- let!(:status_message1) { user2.post :status_message, :message => "hi", :to => user2.aspects.first.id }
- let!(:status_message2) { user2.post :status_message, :message => "hey", :public => true , :to => user2.aspects.first.id }
- let!(:status_message3) { user2.post :status_message, :message => "va", :to => user2.aspects.first.id }
- let!(:status_message4) { user2.post :status_message, :message => "da", :public => true , :to => user2.aspects.first.id }
- let!(:status_message5) { user3.post :status_message, :message => "heyyyy", :to => user3.aspects.first.id}
- let!(:status_message6) { user4.post :status_message, :message => "yooo", :to => user4.aspects.first.id}
-
-
- before do
- friend_users(user, first_aspect, user2, user2.aspects.first)
- friend_users(user, second_aspect, user3, user3.aspects.first)
-
- end
-
- describe '#friends_not_in_aspect' do
- it 'finds the people who are not in the given aspect' do
-
- friend_users(user, first_aspect, user4, user4.aspects.first)
- people = user.friends_not_in_aspect(first_aspect)
- people.should == [user3.person]
-
- people2 = user.friends_not_in_aspect(second_aspect)
- people2.count.should == 2
- people2.include?(user2.person).should be true
- people2.include?(user4.person).should be true
- end
- end
+ context 'with two posts' do
+ let!(:status_message1) { user2.post :status_message, :message => "hi", :to => user2.aspects.first.id }
+ let!(:status_message2) { user2.post :status_message, :message => "hey", :public => true , :to => user2.aspects.first.id }
+
+
describe "#visible_posts" do
- it "queries by person id" do
- user2.visible_posts(:person_id => user2.person.id).include?(status_message1).should == true
- user2.visible_posts(:person_id => user2.person.id).include?(status_message2).should == true
- user2.visible_posts(:person_id => user2.person.id).include?(status_message3).should == true
- user2.visible_posts(:person_id => user2.person.id).include?(status_message4).should == true
- end
-
- it "selects public posts" do
- user2.visible_posts(:public => true).include?(status_message2).should == true
- user2.visible_posts(:public => true).include?(status_message4).should == true
- end
-
- it "selects non public posts" do
- user2.visible_posts(:public => false).include?(status_message1).should == true
- user2.visible_posts(:public => false).include?(status_message3).should == true
- end
+ it "queries by person id" do
+ query = user2.visible_posts(:person_id => user2.person.id)
+ query.include?(status_message1).should == true
+ query.include?(status_message2).should == true
+ end
- it "selects by message contents" do
- user2.visible_posts(:message => "hi").include?(status_message1).should == true
- end
+ it "selects public posts" do
+ query = user2.visible_posts(:public => true)
+ query.include?(status_message2).should == true
+ query.include?(status_message1).should == false
+ end
- it "queries by aspect" do
- friend_users(user, second_aspect, user4, user4.aspects.first)
+ it "selects non public posts" do
+ query = user2.visible_posts(:public => false)
+ query.include?(status_message1).should == true
+ query.include?(status_message2).should == false
+ end
- user.receive status_message4.to_diaspora_xml, user2.person
- user.receive status_message5.to_diaspora_xml, user3.person
- user.receive status_message6.to_diaspora_xml, user4.person
+ it "selects by message contents" do
+ user2.visible_posts(:message => "hi").include?(status_message1).should == true
+ end
- user.visible_posts(:by_members_of => first_aspect).should =~ [status_message4]
- user.visible_posts(:by_members_of => second_aspect).should =~ [status_message5, status_message6]
+ context 'with two users' do
+ let!(:user) {Factory :user}
+ let!(:first_aspect) {user.aspect(:name => 'bruisers')}
+ let!(:second_aspect) {user.aspect(:name => 'losers')}
+
+ it "queries by aspect" do
+ friend_users(user, first_aspect, user2, user2.aspects.first)
+ user.receive status_message1.to_diaspora_xml, user2.person
+
+ user.visible_posts(:by_members_of => first_aspect).should =~ [status_message1]
+ user.visible_posts(:by_members_of => second_aspect).should =~ []
+ end
+ it '#find_visible_post_by_id' do
+ user2.find_visible_post_by_id(status_message1.id).should == status_message1
+ user.find_visible_post_by_id(status_message1.id).should == nil
+ end
+ end
end
end
- context 'querying' do
- describe '#find_visible_post_by_id' do
- it 'should query' do
- user2.find_visible_post_by_id(status_message1.id).should == status_message1
- user.find_visible_post_by_id(status_message1.id).should == nil
+ context 'with two users' do
+ let!(:user) {Factory :user}
+ let!(:first_aspect) {user.aspect(:name => 'bruisers')}
+ let!(:second_aspect) {user.aspect(:name => 'losers')}
+
+ describe '#friends_not_in_aspect' do
+ it 'finds the people who are not in the given aspect' do
+ user4 = Factory.create(:user_with_aspect)
+ friend_users(user, first_aspect, user4, user4.aspects.first)
+ friend_users(user, second_aspect, user2, user2.aspects.first)
+
+ people = user.friends_not_in_aspect(first_aspect)
+ people.should == [user2.person]
end
end
describe '#find_friend_by_id' do
- it 'should find both friends' do
- user.reload
+ it 'should find a friend' do
+ friend_users(user, first_aspect, user2, user2.aspects.first)
user.find_friend_by_id(user2.person.id).should == user2.person
- user.find_friend_by_id(user3.person.id).should == user3.person
end
it 'should not find a non-friend' do
- user3.find_friend_by_id(user4.person.id).should be nil
+ user = Factory :user
+ user.find_friend_by_id(user2.person.id).should be nil
end
-
end
end
-
- context 'albums' do
-
+ describe '#albums_by_aspect' do
+ let!(:first_aspect) {user2.aspect(:name => 'bruisers')}
+ let!(:second_aspect) {user2.aspect(:name => 'losers')}
before do
- user.post :album, :name => "Georges", :to => first_aspect.id
- user.post :album, :name => "Borges", :to => first_aspect.id
- user.post :album, :name => "Luises", :to => second_aspect.id
- user.reload
+ user2.post :album, :name => "Georges", :to => first_aspect.id
+ user2.post :album, :name => "Borges", :to => first_aspect.id
+ user2.post :album, :name => "Luises", :to => second_aspect.id
+ user2.reload
end
it 'should find all albums if passed :all' do
- user.albums_by_aspect(:all).should have(3).albums
+ user2.albums_by_aspect(:all).should have(3).albums
end
it 'should return the right number of albums' do
- user.albums_by_aspect(first_aspect.reload).should have(2).albums
- user.albums_by_aspect(second_aspect.reload).should have(1).album
+ user2.albums_by_aspect(first_aspect.reload).should have(2).albums
+ user2.albums_by_aspect(second_aspect.reload).should have(1).album
end
end
end
-
--
GitLab