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

Merge pull request #3036 from diasp/missing-template

Browse source 
Added status message spec, fix render nothing
This commit is contained in:
Dennis Collective 2012-03-22 11:42:45 -07:00
commit cfe71f612e
2 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/status_messages_controller.rb
View file

@ -65,14 +65,15 @@ class StatusMessagesController < ApplicationController
end
respond_to do |format|
format.html { redirect_to :back}
format.mobile{ redirect_to stream_path}
format.json{ render :json => @status_message.as_api_response(:backbone), :status => 201 }
format.html { redirect_to :back }
format.mobile { redirect_to stream_path }
format.json { render :json => @status_message.as_api_response(:backbone), :status => 201 }
end
else
respond_to do |format|
format.json { render :nothing, :status => 403 }
format.html { redirect_to :back }
format.mobile { redirect_to stream_path }
format.json { render :nothing => true , :status => 403 }
end
end
end

34
spec/controllers/status_messages_controller_spec.rb
View file

@ -79,6 +79,40 @@ describe StatusMessagesController do
:aspect_ids => [@aspect1.id.to_s] }
}
it 'creates with valid html' do
post :create, status_message_hash
response.status.should == 302
response.should be_redirect
end
it 'creates with invalid html' do
post :create, status_message_hash.merge(:status_message => { :text => "0123456789" * 7000 })
response.status.should == 302
response.should be_redirect
end
it 'creates with valid json' do
post :create, status_message_hash.merge(:format => 'json')
response.status.should == 201
end
it 'creates with invalid json' do
post :create, status_message_hash.merge(:status_message => { :text => "0123456789" * 7000 }, :format => 'json')
response.status.should == 403
end
it 'creates with valid mobile' do
post :create, status_message_hash.merge(:format => 'mobile')
response.status.should == 302
response.should be_redirect
end
it 'creates with invalid mobile' do
post :create, status_message_hash.merge(:status_message => { :text => "0123456789" * 7000 }, :format => 'mobile')
response.status.should == 302
response.should be_redirect
end
it 'removes getting started from new users' do
@controller.should_receive(:remove_getting_started)
post :create, status_message_hash