X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=spec%2Fmodels%2Flicense_group_spec.rb;fp=spec%2Fmodels%2Flicense_group_spec.rb;h=685c69a57f5f97039397d542b4f4550defb1ba6e;hp=a1c4f70feb68543f2a888c8d5589b7596f9d6c6b;hb=305f415a00ff3da658a5ee77cf966e7f76f8230f;hpb=000b5d5ef4f3cf02793ae6a06855b7bd3cd9a78f diff --git a/spec/models/license_group_spec.rb b/spec/models/license_group_spec.rb index a1c4f70f..685c69a5 100644 --- a/spec/models/license_group_spec.rb +++ b/spec/models/license_group_spec.rb @@ -190,9 +190,9 @@ describe LicenseGroup 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 = LicenseGroup.list.to_json LicenseGroup.list_json_opt @@ -251,9 +251,9 @@ describe LicenseGroup 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 = LicenseGroup.show(@lg.id).to_json LicenseGroup.show_json_opt