@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\r
+ @scroll = FactoryGirl.create :scroll, :author_id => @author.id, :visible => 1\r
@panel = FactoryGirl.create :panel, :author_id => @author.id, :publish => 1\r
- @story = FactoryGirl.create :story, :author_id => @author.id, :comic_id => @comic.id, :panel_id => @panel.id\r
+ @scroll_panel = FactoryGirl.create :scroll_panel, :author_id => @author.id, :scroll_id => @scroll.id, :panel_id => @panel.id\r
end\r
it 'ライセンスを含んでいる' do\r
r = ResourcePicture.list.to_json ResourcePicture.list_json_opt\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\r
+ @scroll = FactoryGirl.create :scroll, :author_id => @author.id, :visible => 1\r
@panel = FactoryGirl.create :panel, :author_id => @author.id, :publish => 1\r
- @story = FactoryGirl.create :story, :author_id => @author.id, :comic_id => @comic.id, :panel_id => @panel.id\r
+ @scroll_panel = FactoryGirl.create :scroll_panel, :author_id => @author.id, :scroll_id => @scroll.id, :panel_id => @panel.id\r
end\r
it 'ライセンスを含んでいる' do\r
r = ResourcePicture.show(@rp.id, @author).to_json ResourcePicture.show_json_opt\r