nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a problem with re-saving deleted objects in a spec in postgres, add postgres to test group in gemfile

Browse source
This commit is contained in:
Raphael Sofaer 2011-08-18 16:04:55 -07:00
parent 31584eed84
commit 60e9fd54e2
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -101,6 +101,8 @@ group :test, :development do
end end
group :test do group :test do
gem 'mysql2', '0.2.6'
gem 'pg'
gem 'factory_girl_rails' gem 'factory_girl_rails'
gem 'fixture_builder', '0.2.2' gem 'fixture_builder', '0.2.2'
gem 'selenium-webdriver', '2.4' gem 'selenium-webdriver', '2.4'

2
Gemfile.lock
View file

@ -319,6 +319,7 @@ GEM
oa-openid (= 0.2.6) oa-openid (= 0.2.6)
open4 (1.1.0) open4 (1.1.0)
orm_adapter (0.0.5) orm_adapter (0.0.5)
pg (0.11.0)
polyglot (0.3.2) polyglot (0.3.2)
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
rack (1.2.3) rack (1.2.3)
@ -498,6 +499,7 @@ DEPENDENCIES
oauth2-provider (= 0.0.16) oauth2-provider (= 0.0.16)
ohai (= 0.5.8) ohai (= 0.5.8)
omniauth (= 0.2.6) omniauth (= 0.2.6)
pg
rails (= 3.0.9) rails (= 3.0.9)
rails-i18n rails-i18n
rcov rcov

25
spec/integration/receiving_spec.rb
View file

@ -233,10 +233,10 @@ describe 'a user receives a post' do
receive_with_zord(bob, alice.person, xml) receive_with_zord(bob, alice.person, xml)
receive_with_zord(eve, alice.person, xml) receive_with_zord(eve, alice.person, xml)
@comment = eve.comment('tada',:post => @post) comment = eve.comment('tada',:post => @post)
@comment.parent_author_signature = @comment.sign_with_key(alice.encryption_key) comment.parent_author_signature = comment.sign_with_key(alice.encryption_key)
@xml = @comment.to_diaspora_xml @xml = comment.to_diaspora_xml
@comment.delete comment.delete
end end
it 'should correctly attach the user already on the pod' do it 'should correctly attach the user already on the pod' do
@ -254,17 +254,14 @@ describe 'a user receives a post' do
eve.delete eve.delete
Person.where(:id => remote_person.id).delete_all Person.where(:id => remote_person.id).delete_all
Profile.where(:person_id => remote_person.id).delete_all Profile.where(:person_id => remote_person.id).delete_all
remote_person.id = nil remote_person.attributes.delete(:id) # leaving a nil id causes it to try to save with id set to NULL in postgres
Person.should_receive(:by_account_identifier).twice.and_return{ |handle| m = mock()
if handle == alice.person.diaspora_handle Webfinger.should_receive(:new).twice.with(eve.person.diaspora_handle).and_return(m)
alice.person.save m.should_receive(:fetch).twice.and_return{
alice.person remote_person.save(:validate => false)
else remote_person.profile = Factory(:profile, :person => remote_person)
remote_person.save(:validate => false) remote_person
remote_person.profile = Factory(:profile, :person => remote_person)
remote_person
end
} }
bob.reload.visible_posts.size.should == 1 bob.reload.visible_posts.size.should == 1