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

adding pending spec to check for error within webfinger process

Browse source
This commit is contained in:
maxwell 2010-10-25 00:52:36 -07:00
parent dae9f6540b
commit acd977a115
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
spec/controllers/requests_controller_spec.rb
View file

@ -53,11 +53,8 @@ describe RequestsController do
it 'should redirect to the page which you called it from ' do it 'should redirect to the page which you called it from ' do
pending "i need to figure out how to do this" pending "i need to figure out how to do this"
end end
<<<<<<< HEAD
it 'should not blow up if there is a problem mid way thru the webfinger process' do it 'should not blow up if there is a problem mid way thru the webfinger process' do
pending "i need to do this tomorrow pending "i need to do this tomorrow'
end end
=======
>>>>>>> EM websocket cleanly merged with master. webfingering is now async
end end