X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=spec%2Fmodels%2Foriginal_picture_spec.rb;h=cc587fc3ef694b9b9d75948919e73041ace68eec;hb=305f415a00ff3da658a5ee77cf966e7f76f8230f;hp=54c6d2c3304adc0a589e2e18321a474000c5196a;hpb=000b5d5ef4f3cf02793ae6a06855b7bd3cd9a78f;p=pettanr%2Fpettanr.git

diff --git a/spec/models/original_picture_spec.rb b/spec/models/original_picture_spec.rb
index 54c6d2c3..cc587fc3 100644
--- a/spec/models/original_picture_spec.rb
+++ b/spec/models/original_picture_spec.rb
@@ -542,9 +542,9 @@ describe OriginalPicture do
       @p = FactoryGirl.create :picture, :original_picture_id => @op.id, :license_id => @license.id, :artist_id => @artist.id
       @rp = FactoryGirl.create :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => @op.id, :picture_id => @p.id
       @sbt = FactoryGirl.create :speech_balloon_template
-      @comic = FactoryGirl.create :comic, :author_id => @author.id, :visible => 1
+      @scroll = FactoryGirl.create :scroll, :author_id => @author.id, :visible => 1
       @panel = FactoryGirl.create :panel, :author_id => @author.id, :publish => 1
-      @story = FactoryGirl.create :story, :author_id => @author.id, :comic_id => @comic.id, :panel_id => @panel.id
+      @scroll_panel = FactoryGirl.create :scroll_panel, :author_id => @author.id, :scroll_id => @scroll.id, :panel_id => @panel.id
     end
     it '素材を含んでいる' do
       r = OriginalPicture.mylist(@artist).to_json OriginalPicture.list_json_opt
@@ -681,9 +681,9 @@ describe OriginalPicture do
       @p = FactoryGirl.create :picture, :original_picture_id => @op.id, :license_id => @license.id, :artist_id => @artist.id
       @rp = FactoryGirl.create :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => @op.id, :picture_id => @p.id
       @sbt = FactoryGirl.create :speech_balloon_template
-      @comic = FactoryGirl.create :comic, :author_id => @author.id, :visible => 1
+      @scroll = FactoryGirl.create :scroll, :author_id => @author.id, :visible => 1
       @panel = FactoryGirl.create :panel, :author_id => @author.id, :publish => 1
-      @story = FactoryGirl.create :story, :author_id => @author.id, :comic_id => @comic.id, :panel_id => @panel.id
+      @scroll_panel = FactoryGirl.create :scroll_panel, :author_id => @author.id, :scroll_id => @scroll.id, :panel_id => @panel.id
     end
     it '素材を含んでいる' do
       r = OriginalPicture.show(@op.id, @artist).to_json OriginalPicture.show_json_opt