X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=spec%2Fmodels%2Fstory_spec.rb;h=c023a7775602022250094155037cedbc3c80df6e;hb=e16d81f2c39f0a22470a85f476440d6a1dc75518;hp=6a3443ac1375d3076a527ab9adbf9b662e2aaf55;hpb=bb888277dc9e9a8f14453a819ed60f27225ce7fa;p=pettanr%2Fpettanr.git diff --git a/spec/models/story_spec.rb b/spec/models/story_spec.rb index 6a3443ac..c023a777 100644 --- a/spec/models/story_spec.rb +++ b/spec/models/story_spec.rb @@ -7,7 +7,6 @@ describe Story do @sp = FactoryGirl.create :system_picture @lg = FactoryGirl.create :license_group @license = FactoryGirl.create :license, :license_group_id => @lg.id, :system_picture_id => @sp.id - @color = FactoryGirl.create :color @user = FactoryGirl.create( :user_yas) @author = FactoryGirl.create :author, :user_id => @user.id @artist = FactoryGirl.create :artist_yas, :author_id => @author.id @@ -778,14 +777,11 @@ describe Story do FactoryGirl.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id, :t => 0) ) @gc = @panel.ground_colors.create( - FactoryGirl.attributes_for(:ground_color, :panel_id => @panel.id, :color_id => @color.id) + FactoryGirl.attributes_for(:ground_color, :panel_id => @panel.id) ) @gp = @panel.ground_pictures.create( FactoryGirl.attributes_for(:ground_picture, :panel_id => @panel.id, :picture_id => @p.id) ) - @pc = @panel.panel_colors.create( - FactoryGirl.attributes_for(:panel_color, :panel_id => @panel.id, :code => 0xff0000) - ) @panel.reload @comic = FactoryGirl.create :comic, :author_id => @author.id @story = FactoryGirl.create :story, :author_id => @author.id, :comic_id => @comic.id, :panel_id => @panel.id