github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 236_paginate_has_many

Browse Source
This commit is contained in:
Mario Visic 2011-10-29 14:36:01 +08:00
commit 9f8906d840
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/locomotive/routing/site_dispatcher.rb
View File

@ -39,7 +39,7 @@ module Locomotive
end end
def render_no_site_error def render_no_site_error
render :template => '/admin/errors/no_site', :layout => false render :template => '/admin/errors/no_site', :layout => false, :status => :not_found
end end
def validate_site_membership def validate_site_membership

12
spec/lib/locomotive/routing/site_dispatcher_spec.rb
View File

@ -147,11 +147,19 @@ describe Locomotive::Routing::SiteDispatcher do
describe '#render_no_site_error' do describe '#render_no_site_error' do
it 'renders the no site template with no layout' do before :each do
@controller.expects(:render).with(:template => '/admin/errors/no_site', :layout => false) @controller.instance_variable_set('@_response', ActionDispatch::Response.new)
@controller.send(:render_no_site_error) @controller.send(:render_no_site_error)
end end
it 'should have a no site error message' do
@controller.response.body.should include 'No Site'
end
it 'should have a 404 not found status' do
@controller.response.should be_not_found
end
end end
describe '#validate_site_membership' do describe '#validate_site_membership' do