merge v04

[pettanr/pettanr.git] / spec / factories.rb

diff --git a/spec/factories.rb b/spec/factories.rb
index 779e4ed..f48eb7b 100644 (file)
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -84,39 +84,6 @@ Factory.define :comic, :class => Comic do |comic|
   comic.width 100
   comic.height 10
   comic.visible 3
-  comic.editable 3
-end
-
-Factory.define :normal_comic, :class => Comic do |comic|
-  comic.title "normal_comic"
-  comic.width 100
-  comic.height 10
-  comic.visible 3
-  comic.editable 0
-end
-
-Factory.define :visible_comic, :class => Comic do |comic|
-  comic.title "visible_comic"
-  comic.width 100
-  comic.height 10
-  comic.visible 3
-  comic.editable 0
-end
-
-Factory.define :editable_comic, :class => Comic do |comic|
-  comic.title "editable_comic"
-  comic.width 100
-  comic.height 10
-  comic.visible 3
-  comic.editable 3
-end
-
-Factory.define :hidden_comic, :class => Comic do |comic|
-  comic.title "hidden_comic"
-  comic.width 100
-  comic.height 10
-  comic.visible 0
-  comic.editable 0
 end
 
 Factory.define :original_picture, :class => OriginalPicture do |op|
@@ -125,7 +92,16 @@ Factory.define :original_picture, :class => OriginalPicture do |op|
   op.height 111
   op.filesize 100000
   op.artist_id 1
-  op.license_id 1
+end
+
+Factory.define :oplg, :class => OriginalPictureLicenseGroup do |oplg|
+  oplg.original_picture_id 1
+  oplg.license_group_id 1
+end
+
+Factory.define :standard_license, :class => StandardLicense do |sl|
+  sl.license_id 1
+  sl.artist_name 'no name'
 end
 
 Factory.define :resource_picture, :class => ResourcePicture do |rp|
@@ -135,9 +111,25 @@ Factory.define :resource_picture, :class => ResourcePicture do |rp|
   rp.filesize 100000
   rp.artist_id 1
   rp.license_id 1
+  rp.classname 'StandardLicense'
   rp.original_picture_id 1
 end
 
+Factory.define :picture, :class => Picture do |p|
+  p.original_picture_id 1
+  p.revision 1
+  p.ext 'png'
+  p.width 222
+  p.height 111
+  p.filesize 100000
+  p.artist_id 1
+  p.license_id 1
+  p.artist_name 'no name'
+  p.classname 'StandardLicense'
+  p.credit ''
+  p.settings ''
+end
+
 Factory.define :system_picture, :class => SystemPicture do |sp|
   sp.ext 'png'
   sp.width 222
@@ -197,14 +189,19 @@ Factory.define :panel_picture, :class => PanelPicture do |pp|
 end
 
 Factory.define :panel, :class => Panel do |panel|
-  panel.comic_id 1
   panel.border 1
   panel.x nil
   panel.y nil
   panel.z nil
-  panel.t 0
   panel.width 100
   panel.height 300
+  panel.publish 1
   panel.author_id 1
 end
 
+Factory.define :story, :class => Story do |story|
+  story.comic_id 1
+  story.panel_id 1
+  story.author_id 1
+  story.t 0
+end