From 9ee10450c49b7f8fcace3a00563c19ce68deeace Mon Sep 17 00:00:00 2001 From: ilya Date: Tue, 17 Aug 2010 22:32:13 -0700 Subject: [PATCH] removing traces of bookmarks and blogs from specs --- spec/models/person_spec.rb | 87 ++++++++++++++++++++------------------ spec/models/post_spec.rb | 29 ++++++------- 2 files changed, 59 insertions(+), 57 deletions(-) diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb index 70f439e25..a571e0582 100644 --- a/spec/models/person_spec.rb +++ b/spec/models/person_spec.rb @@ -9,7 +9,6 @@ describe Person do @group2 = @user2.group(:name => "Abscence of Babes") end - it 'should not allow two people with the same email' do person_two = Factory.build(:person, :url => @person.email) person_two.valid?.should == false @@ -19,125 +18,129 @@ describe Person do before do @xml = @person.to_xml.to_s end + it 'should serialize to xml' do - (@xml.include? "person").should == true + @xml.include?("person").should == true end it 'should have a profile in its xml' do - (@xml.include? "first_name").should == true + @xml.include?("first_name").should == true end end it 'should know when a post belongs to it' do person_message = Factory.create(:status_message, :person => @person) - person_two = Factory.create(:person) + person_two = Factory.create(:person) - @person.owns?(person_message).should be true + @person.owns? (person_message).should be true person_two.owns?(person_message).should be false end it 'should delete all of user except comments upon user deletion' do - f = Factory.create(:person) + person = Factory.create(:person) - Factory.create(:status_message, :person => f) - Factory.create(:blog, :person => f) - Factory.create(:bookmark, :person => f) - Factory.create(:status_message, :person => f) - s = Factory.create(:status_message, :person => @person) + Factory.create(:status_message, :person => person) + Factory.create(:status_message, :person => person) + Factory.create(:status_message, :person => person) + Factory.create(:status_message, :person => person) + + status_message = Factory.create(:status_message, :person => @person) - Factory.create(:comment, :person_id => f.id, :text => "yes i do", :post => s) - Factory.create(:comment, :person_id => f.id, :text => "i love you", :post => s) - Factory.create(:comment, :person_id => f.id, :text => "hello", :post => s) - Factory.create(:comment, :person_id => @person.id, :text => "you are creepy", :post => s) + Factory.create(:comment, :person_id => person.id, :text => "yes i do", :post => status_message) + Factory.create(:comment, :person_id => person.id, :text => "i love you", :post => status_message) + Factory.create(:comment, :person_id => person.id, :text => "hello", :post => status_message) + Factory.create(:comment, :person_id => @person.id, :text => "you are creepy", :post => status_message) - f.destroy + person.destroy - Post.count.should == 1 + Post.count.should == 1 Comment.all.count.should == 4 - s.comments.count.should == 4 + status_message.comments.count.should == 4 end describe "unfriending" do it 'should delete an orphaned friend' do - request = @user.send_friend_request_to @person.receive_url, @group.id @user.activate_friend(@person, @group) @user.reload - Person.all.count.should == 3 + Person.all.count.should == 3 @user.friends.count.should == 1 @user.unfriend(@person) @user.reload @user.friends.count.should == 0 - Person.all.count.should == 2 + Person.all.count.should == 2 end it 'should not delete an un-orphaned friend' do request = @user.send_friend_request_to @person.receive_url, @group.id request2 = @user2.send_friend_request_to @person.receive_url, @group2.id - @user.activate_friend(@person, @group) + @user.activate_friend (@person, @group) @user2.activate_friend(@person, @group2) @user.reload @user2.reload - Person.all.count.should == 3 - @user.friends.count.should == 1 + Person.all.count.should == 3 + @user.friends.count.should == 1 @user2.friends.count.should == 1 @user.unfriend(@person) @user.reload @user2.reload - @user.friends.count.should == 0 + @user.friends.count.should == 0 @user2.friends.count.should == 1 - Person.all.count.should == 3 + Person.all.count.should == 3 end end + describe 'searching' do before do - @friend_one = Factory.create(:person) - @friend_two = Factory.create(:person) + @friend_one = Factory.create(:person) + @friend_two = Factory.create(:person) @friend_three = Factory.create(:person) - @friend_four = Factory.create(:person) + @friend_four = Factory.create(:person) @friend_one.profile.first_name = "Robert" - @friend_one.profile.last_name = "Grimm" + @friend_one.profile.last_name = "Grimm" @friend_one.profile.save @friend_two.profile.first_name = "Eugene" - @friend_two.profile.last_name = "Weinstein" + @friend_two.profile.last_name = "Weinstein" @friend_two.save @friend_three.profile.first_name = "Yevgeniy" - @friend_three.profile.last_name = "Dodis" + @friend_three.profile.last_name = "Dodis" @friend_three.save @friend_four.profile.first_name = "Casey" - @friend_four.profile.last_name = "Grippi" + @friend_four.profile.last_name = "Grippi" @friend_four.save end + it 'should yield search results on partial names' do people = Person.search("Eu") - people.include?(@friend_two).should == true - people.include?(@friend_one).should == false + people.include?(@friend_two).should == true + people.include?(@friend_one).should == false people.include?(@friend_three).should == false - people.include?(@friend_four).should == false + people.include?(@friend_four).should == false people = Person.search("Wei") - people.include?(@friend_two).should == true - people.include?(@friend_one).should == false + people.include?(@friend_two).should == true + people.include?(@friend_one).should == false people.include?(@friend_three).should == false - people.include?(@friend_four).should == false + people.include?(@friend_four).should == false people = Person.search("Gri") - people.include?(@friend_one).should == true - people.include?(@friend_four).should == true - people.include?(@friend_two).should == false + people.include?(@friend_one).should == true + people.include?(@friend_four).should == true + people.include?(@friend_two).should == false people.include?(@friend_three).should == false end + it 'should search by email exactly' do Person.by_webfinger(@friend_one.email).should == @friend_one end diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index 12c84ccfe..9ec8ccb19 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -10,35 +10,34 @@ describe Post do before do @person_one = Factory.create(:person, :email => "some@dudes.com") @person_two = Factory.create(:person, :email => "other@dudes.com") - (2..4).each {|n| Blog.create(:title => "title #{n}", :body => "test #{n}", :person => @person_one)} - (5..8).each { |n| Blog.create(:title => "title #{n}",:body => "test #{n}", :person => @user.person)} - (9..11).each { |n| Blog.create(:title => "title #{n}",:body => "test #{n}", :person => @person_two)} + (2..4).each { |n| Factory.create(:status_message, :message => "test #{n}", :person => @person_one) } + (5..8).each { |n| Factory.create(:status_message, :message => "test #{n}", :person => @user.person)} + (9..11).each { |n| Factory.create(:status_message, :message => "test #{n}", :person => @person_two) } Factory.create(:status_message, :person => @user) - Factory.create(:bookmark, :person => @user) + Factory.create(:status_message, :person => @user) end - it "should give the most recent blog title and body from owner" do - blog = Blog.newest_for(@user.person) - blog.person.email.should == @user.person.email - blog.class.should == Blog - blog.title.should == "title 8" - blog.body.should == "test 8" + it "should give the most recent status_message title and body from owner" do + status_message = StatusMessage.newest_for(@user.person) + status_message.person.email.should == @user.person.email + status_message.class.should == StatusMessage + status_message.message.should == "test 8" end end describe "stream" do before do - @owner = Factory.build(:user) + @owner = Factory.build(:user) @person_one = Factory.create(:person, :email => "some@dudes.com") @person_two = Factory.create(:person, :email => "other@dudes.com") Factory.create(:status_message, :message => "puppies", :created_at => Time.now+1, :person => @owner.person) - Factory.create(:bookmark, :title => "Reddit", :link => "http://reddit.com", :created_at => Time.now+2, :person => @person_one) + Factory.create(:status_message, :message => "http://reddit.com", :created_at => Time.now+2, :person => @person_one) Factory.create(:status_message, :message => "kittens", :created_at => Time.now+3, :person => @person_two) - Factory.create(:blog, :title => "Bears", :body => "Bear's body", :created_at => Time.now+4, :person => @owner.person) - Factory.create(:bookmark, :title => "Google", :link => "http://google.com", :created_at => Time.now+5, :person => @person_two) + Factory.create(:status_message, :message => "Bear's body", :created_at => Time.now+4, :person => @owner.person) + Factory.create(:status_message, :message => "Google", :created_at => Time.now+5, :person => @person_two) end it "should get all posts for a specified user" do @@ -52,7 +51,7 @@ describe Post do describe 'xml' do it 'should serialize to xml with its person' do message = Factory.create(:status_message, :person => @user.person) - (message.to_xml.to_s.include? @user.person.email).should == true + message.to_xml.to_s.include?(@user.person.email).should == true end end