From ff3666df5e36efb852f12e8205355e54e111f8c8 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Wed, 20 Oct 2010 16:40:43 -0700
Subject: [PATCH] Cut parser spec time by a couple seconds
---
spec/lib/diaspora_parser_spec.rb | 139 +++++++++++--------------------
1 file changed, 49 insertions(+), 90 deletions(-)
diff --git a/spec/lib/diaspora_parser_spec.rb b/spec/lib/diaspora_parser_spec.rb
index 1585d5d750..72b3d96e08 100644
--- a/spec/lib/diaspora_parser_spec.rb
+++ b/spec/lib/diaspora_parser_spec.rb
@@ -5,149 +5,108 @@
require 'spec_helper'
describe Diaspora::Parser do
- before do
- @user = Factory.create(:user)
- @aspect = @user.aspect(:name => 'spies')
-
- @user3 = Factory.create :user
- @person = @user3.person
- @user2 = Factory.create(:user)
- @aspect2 = @user2.aspect(:name => "pandas")
- friend_users(@user, @aspect, @user2, @aspect2)
- end
+ let(:user) {Factory.create(:user)}
+ let(:aspect) {user.aspect(:name => 'spies')}
+ let(:user2) {Factory.create(:user)}
+ let(:aspect2){user2.aspect(:name => "pandas")}
+ let(:user3) {Factory.create :user}
+ let(:person) {user3.person}
describe "parsing compliant XML object" do
- before do
- @xml = Factory.build(:status_message).to_diaspora_xml
- end
-
it 'should be able to correctly handle comments with person in db' do
- person = Factory.create(:person)
- post = Factory.create(:status_message, :person => @user.person)
- comment = Factory.build(:comment, :post => post, :person => person, :text => "Freedom!")
+ post = user.post :status_message, :message => "hello", :to => aspect.id
+ comment = Factory.build(:comment, :post => post, :person => @person, :text => "Freedom!")
xml = comment.to_diaspora_xml
comment = Diaspora::Parser.from_xml(xml)
comment.text.should == "Freedom!"
- comment.person.should == person
+ comment.person.should == @person
comment.post.should == post
end
it 'should be able to correctly handle person on a comment with person not in db' do
- commenter = Factory.create(:user)
- commenter_aspect = commenter.aspect :name => "bruisers"
- friend_users(@user, @aspect, commenter, commenter_aspect)
- post = @user.post :status_message, :message => "hello", :to => @aspect.id
- comment = commenter.comment "Fool!", :on => post
+ friend_users(user, aspect, user2, aspect2)
+ post = user.post :status_message, :message => "hello", :to => aspect.id
+ comment = user2.comment "Fool!", :on => post
xml = comment.to_diaspora_xml
- commenter.delete
- commenter.person.delete
+ user2.delete
+ user2.person.delete
parsed_person = Diaspora::Parser::parse_or_find_person_from_xml(xml)
parsed_person.save.should be true
- parsed_person.diaspora_handle.should == commenter.person.diaspora_handle
+ parsed_person.diaspora_handle.should == user2.person.diaspora_handle
parsed_person.profile.should_not be_nil
end
- it 'should marshal retractions' do
- person = @user2.person
- message = Factory.create(:status_message, :person => person)
+ it 'should accept retractions' do
+ friend_users(user, aspect, user2, aspect2)
+ message = Factory.create(:status_message, :person => user2.person)
retraction = Retraction.for(message)
xml = retraction.to_diaspora_xml
- proc {@user.receive xml, person}.should change(StatusMessage, :count).by(-1)
+ proc {user.receive xml, user2.person}.should change(StatusMessage, :count).by(-1)
end
it "should create a new person upon getting a person request" do
- person_count = Person.all.count
- request = Request.instantiate(:to =>"http://www.google.com/", :from => @person)
+ request = Request.instantiate(:to =>"http://www.google.com/", :from => person)
- original_person_id = @person.id
xml = request.to_diaspora_xml
- @user3.destroy
- @person.destroy
- Person.all.count.should == person_count -1
- @user.receive xml, @person
- Person.all.count.should == person_count
-
- Person.first(:_id => original_person_id).serialized_public_key.include?("PUBLIC").should be true
- url = "http://" + request.callback_url.split("/")[2] + "/"
- Person.where(:url => url).first.id.should == original_person_id
+ user3.destroy
+ person.destroy
+ user
+ lambda {user.receive xml, person}.should change(Person, :count).by(1)
end
it "should not create a new person if the person is already here" do
- person_count = Person.all.count
- request = Request.instantiate(:to =>"http://www.google.com/", :from => @user2.person)
-
- original_person_id = @user2.person.id
+ request = Request.instantiate(:to =>"http://www.google.com/", :from => user2.person)
+ original_person_id = user2.person.id
xml = request.to_diaspora_xml
+ user
+ lambda {user.receive xml, user2.person}.should_not change(Person, :count)
- Person.all.count.should be person_count
- @user.receive xml, @user2.person
- Person.all.count.should be person_count
-
- @user2.reload
- @user2.person.reload
- @user2.serialized_private_key.include?("PRIVATE").should be true
+ user2.reload
+ user2.person.reload
+ user2.serialized_private_key.include?("PRIVATE").should be true
url = "http://" + request.callback_url.split("/")[2] + "/"
Person.where(:url => url).first.id.should == original_person_id
end
it "should activate the Person if I initiated a request to that url" do
- request = @user.send_friend_request_to( @user3.person, @aspect)
- @user.reload
- request.reverse_for @user3
+ request = user.send_friend_request_to( user3.person, aspect)
+ user.reload
+ request.reverse_for user3
xml = request.to_diaspora_xml
- @user3.person.destroy
- @user3.destroy
+ user3.person.destroy
+ user3.destroy
- @user.receive xml, @user3.person
- new_person = Person.first(:url => @user3.person.url)
+ user.receive xml, user3.person
+ new_person = Person.first(:url => user3.person.url)
new_person.nil?.should be false
- @user.reload
- @aspect.reload
- @aspect.people.include?(new_person).should be true
- @user.friends.include?(new_person).should be true
+ user.reload
+ aspect.reload
+ aspect.people.include?(new_person).should be true
+ user.friends.include?(new_person).should be true
end
it 'should process retraction for a person' do
- user4 = Factory(:user)
-
- person_count = Person.all.count
- request = @user.send_friend_request_to( user4.person, @aspect)
- @user.reload
- request.reverse_for user4
- xml = request.to_diaspora_xml
-
- retraction = Retraction.for(user4)
+ friend_users(user, aspect, user2, aspect2)
+ retraction = Retraction.for(user2)
retraction_xml = retraction.to_diaspora_xml
- user4.person.destroy
- user4.destroy
- @user.receive xml, user4.person
-
-
- @aspect.reload
- aspect_people_count = @aspect.people.size
- #They are now friends
-
- Person.count.should == person_count
- @user.receive retraction_xml, user4.person
-
-
- @aspect.reload
- @aspect.people.size.should == aspect_people_count -1
+ lambda {user.receive retraction_xml, user2.person}.should change{
+ aspect.reload.people.size}.by(-1)
end
it 'should marshal a profile for a person' do
+ friend_users(user, aspect, user2, aspect2)
#Create person
- person = @user2.person
+ person = user2.person
id = person.id
person.profile = Profile.new(:first_name => 'bob', :last_name => 'billytown', :image_url => "http://clown.com")
person.save
@@ -167,7 +126,7 @@ describe Diaspora::Parser do
old_profile.first_name.should == 'bob'
#Marshal profile
- @user.receive xml, person
+ user.receive xml, person
#Check that marshaled profile is the same as old profile
person = Person.first(:id => person.id)
--
GitLab