merge v04

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

diff --git a/spec/models/panel_spec.rb b/spec/models/panel_spec.rb
index 1398367..12e8205 100644 (file)
--- a/spec/models/panel_spec.rb
+++ b/spec/models/panel_spec.rb
@@ -4,14 +4,18 @@ require 'spec_helper'
 describe Panel do\r
   before do\r
     Factory :admin\r
-    @license = Factory :license\r
+    @sp = Factory :system_picture
+    @lg = Factory :license_group
+    @license = Factory :license, :license_group_id => @lg.id, :system_picture_id => @sp.id
     @user = Factory( :user_yas)\r
     @author = @user.author\r
     @artist = Factory :artist_yas, :author_id => @author.id\r
     @other_user = Factory( :user_yas)\r
     @other_author = @other_user.author\r
-    @op = Factory :original_picture, :artist_id => @artist.id, :license_id => @license.id\r
-    @rp = Factory :resource_picture, :original_picture_id => @op.id, :license_id => @license.id\r
+    @other_artist = Factory :artist_yas, :author_id => @other_author.id\r
+    @op = Factory :original_picture, :artist_id => @artist.id
+    @p = Factory :picture, :original_picture_id => @op.id, :license_id => @license.id, :artist_id => @artist.id
+    @rp = Factory :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => @op.id, :picture_id => @p.id
     @sbt = Factory :speech_balloon_template\r
   end\r
   \r