t#29620:json output include child

[pettanr/pettanr.git] / spec / models / panel_color_spec.rb

diff --git a/spec/models/panel_color_spec.rb b/spec/models/panel_color_spec.rb
index 7740421..1e960de 100644 (file)
--- a/spec/models/panel_color_spec.rb
+++ b/spec/models/panel_color_spec.rb
@@ -195,7 +195,7 @@ describe PanelColor do
       end
     end
   end
-  describe 'list関連テーブルプションに於いて' do
+  describe '一覧取得オプションに於いて' do
     it 'includeキーを含んでいる' do
       r = PanelColor.list_opt
       r.has_key?(:include).should be_true
@@ -214,21 +214,28 @@ describe PanelColor do
       end
   end
   describe 'json一覧出力オプションに於いて' do
-    it 'includeキーを含んでいる' do
-      r = PanelColor.list_json_opt
-      r.has_key?(:include).should be_true
-    end
-    it '1つの項目を含んでいる' do
-      r = PanelColor.list_json_opt[:include]
-      r.should have(1).items
+    before do
+      @op = FactoryGirl.create :original_picture, :artist_id => @artist.id\r
+      @p = FactoryGirl.create :picture, :original_picture_id => @op.id, :license_id => @license.id, :artist_id => @artist.id\r
+      @rp = FactoryGirl.create :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => @op.id, :picture_id => @p.id\r
+      @sbt = FactoryGirl.create :speech_balloon_template\r
+      @comic = FactoryGirl.create :comic, :author_id => @author.id, :visible => 1
+      @panel = FactoryGirl.create :panel, :author_id => @author.id, :publish => 1
+      @pc = FactoryGirl.create :panel_color, :panel_id => @panel.id
+      @story = FactoryGirl.create :story, :author_id => @author.id, :comic_id => @comic.id, :panel_id => @panel.id
     end
     it 'コマを含んでいる' do
-      r = PanelColor.list_json_opt[:include]
-      r.has_key?(:panel).should be_true
+      r = PanelColor.list.to_json PanelColor.list_json_opt
+      j = JSON.parse r
+      i = j.first
+      i.has_key?('panel').should be_true
     end
       it 'コマは作家を含んでいる' do
-        r = PanelColor.list_json_opt[:include]
-        r[:panel].has_key?(:author).should be_true
+        r = PanelColor.list.to_json PanelColor.list_json_opt
+        j = JSON.parse r
+        i = j.first
+        s = i['panel']
+        s.has_key?('author').should be_true
       end
   end