Merge pull request #199 from mallowlabs/id/199

AbstractController::DoubleRenderError on search_more
codefirst · Jul 20, 2014 · 3a01fa1 · 3a01fa1
2 parents e4f496d + e9a4b44
commit 3a01fa1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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