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

Move statusmessage create view out to partial

Browse source
This commit is contained in:
Raphael Sofaer 2011-03-03 11:10:35 -08:00
parent 8ab54076f8
commit da12954d22
3 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/controllers/status_messages_controller.rb
View file

@ -42,27 +42,14 @@ class StatusMessagesController < ApplicationController
end
respond_to do |format|
format.js { render :json => {:post_id => @status_message.id,
:html => render_to_string(
:partial => 'shared/stream_element',
:locals => {
:post => @status_message,
:person => @status_message.person,
:photos => @status_message.photos,
:comments => [],
:all_aspects => current_user.aspects,
:current_user => current_user
}
)
},
:status => 201 }
format.js { render :create, :status => 201}
format.html { redirect_to :back}
format.mobile{ redirect_to :back}
end
else
respond_to do |format|
format.js { render :json =>{:errors => @status_message.errors.full_messages}, :status => 406 }
format.html {redirect_to :back}
format.html {redirect_to :back}
end
end
end

11
app/views/status_messages/create.js.erb Normal file
View file

@ -0,0 +1,11 @@
<%= {:html => render(
:partial => 'shared/stream_element',
:locals => {
:post => @status_message,
:person => @status_message.person,
:photos => @status_message.photos,
:comments => [],
:all_aspects => current_user.aspects
}
),
:post_id => @status_message.id}.to_json.html_safe%>

24
spec/controllers/status_messages_controller_spec.rb
View file

@ -59,15 +59,29 @@ describe StatusMessagesController do
},
:aspect_ids => [@aspect1.id.to_s] }
}
it 'responds to js requests' do
post :create, status_message_hash.merge(:format => 'js')
response.status.should == 201
context 'js requests' do
it 'responds' do
post :create, status_message_hash.merge(:format => 'js')
response.status.should == 201
end
it 'responds with json' do
post :create, status_message_hash.merge(:format => 'js')
json = JSON.parse(response.body)
json['post_id'].should_not be_nil
json['html'].should_not be_nil
end
it 'escapes XSS' do
xss = "<script> alert('hi browser') </script>"
post :create, status_message_hash.merge(:format => 'js', :message => xss)
json = JSON.parse(response.body)
json['html'].should_not =~ /<script>/
end
end
it "dispatches the post to the specified services" do
s1 = Services::Facebook.new
s1 = Services::Facebook.new
@user1.services << s1
@user1.services << Services::Twitter.new
@user1.services << Services::Twitter.new
status_message_hash[:services] = ['facebook']
@user1.should_receive(:dispatch_post).with(anything(), hash_including(:services => [s1]))
post :create, status_message_hash