t#29680:

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index a138cba..a7ad65f 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -14,7 +14,7 @@ class PanelsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render text: '[' + @panels.map {|i| i.panel_elements_as_json }.join(',') + ']' }
+      format.json { render text: Panel.list_as_json_text(@panels) }
     end
   end
 

diff --git a/spec/controllers/panels_controller_spec.rb b/spec/controllers/panels_controller_spec.rb
index 31e8bfc..8e6c8e1 100644 (file)
--- a/spec/controllers/panels_controller_spec.rb
+++ b/spec/controllers/panels_controller_spec.rb
@@ -71,8 +71,8 @@ describe PanelsController do
           get :index, :format => :json\r
           lambda{JSON.parse(response.body)}.should_not raise_error(JSON::ParserError)\r
         end\r
-        it 'コマモデルにコマのjson出力を問い合わせている' do
-          Panel.any_instance.should_receive(:panel_elements_as_json).exactly(3)
+        it 'ã\82³ã\83\9eã\83¢ã\83\87ã\83«ã\81«ã\82³ã\83\9eã\83ªã\82¹ã\83\88ã\81®jsonå\87ºå\8a\9bã\82\92å\95\8fã\81\84å\90\88ã\82\8fã\81\9bã\81¦ã\81\84ã\82\8b' do
+          Panel.should_receive(:list_as_json_text).exactly(1)
           get :index, :format => :json
         end
         it 'データがリスト構造になっている' do\r