From e9a4b44ee3e61947f83738daed44d8159e2b9ba8 Mon Sep 17 00:00:00 2001 From: mallowlabs Date: Sat, 12 Jul 2014 14:26:42 +0900 Subject: [PATCH] Fixed: DoubleRenderError on search_more refs #199 --- app/controllers/search_controller.rb | 2 +- spec/controllers/search_controller_spec.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index f68c32644..5a7338101 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -44,8 +44,8 @@ def search_more if @results.size > 0 @messages = @results.first[:messages].reverse! end + render :template => 'chat/messages', :layout => false end - render :template => 'chat/messages', :layout => false end private diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb index 4001616ad..8ee843638 100644 --- a/spec/controllers/search_controller_spec.rb +++ b/spec/controllers/search_controller_spec.rb @@ -90,6 +90,12 @@ it { should be_nil } end + context "存在しない部屋" do + before { get :search_more, :search_message => 'foo', :room_id => 'not_exisiting_room_id'} + subject { response } + it { should redirect_to(:controller => 'chat', :action => 'index') } + end + context "検索結果がある" do before do @room = mock