X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=spec%2Ffactories.rb;h=85008140eb22db8af5175c92e3f1a67667a9c7de;hb=3d26243a296405e409d8ae5292efcff436c1d4ab;hp=5c940d96789c932d830d19ab40ef252b82e82a34;hpb=339d45c101d93bf611299e3c90f3883f28937c2b;p=pettanr%2Fpettanr.git

diff --git a/spec/factories.rb b/spec/factories.rb
index 5c940d96..85008140 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -61,14 +61,9 @@ FactoryGirl.define do
     license.system_picture_id 1
   end
 
-  factory :color, :class => Color do |color|
-    color.name 'black'
-    color.code 0
-    color.t 0
-  end
-
   factory :comic, :class => Comic do |comic|
     comic.title "comic"
+    comic.description 'comic description'
     comic.visible 1
   end
 
@@ -79,6 +74,8 @@ FactoryGirl.define do
     op.filesize 100000
     op.artist_id 1
     op.md5 'op8f6bcd4621d373cade4e832627b4f6'
+    op.published_at nil
+    op.stopped_at nil
   end
 
   factory :oplg, :class => OriginalPictureLicenseGroup do |oplg|
@@ -100,7 +97,7 @@ FactoryGirl.define do
 
   factory :picture, :class => Picture do |p|
     p.original_picture_id 1
-    p.revision 1
+    p.revision 0
     p.ext 'png'
     p.width 222
     p.height 111
@@ -127,6 +124,7 @@ FactoryGirl.define do
     sbt.classname 'Plain'
     sbt.caption 'normal fuki'
     sbt.t 0
+    sbt.system_picture_id 1 
     sbt.settings '{}'
   end
 
@@ -137,6 +135,7 @@ FactoryGirl.define do
     sb.z 1
     sb.t 0
     sb.settings '{}'
+    sb.caption 'test pict'
   end
 
   factory :balloon, :class => Balloon do |balloon|
@@ -146,7 +145,6 @@ FactoryGirl.define do
     balloon.y 200
     balloon.width 222 
     balloon.height 333 
-    balloon.caption 'test pict'
     balloon.settings nil
   end
 
@@ -172,15 +170,9 @@ FactoryGirl.define do
     pp.height 300
   end
 
-  factory :panel_color, :class => PanelColor do |pc|
-    pc.panel_id 1
-    pc.z 1
-    pc.code 1
-  end
-
   factory :ground_color, :class => GroundColor do |gc|
     gc.panel_id 1
-    gc.color_id 1
+    gc.code 1
     gc.z 1
   end
 
@@ -192,11 +184,9 @@ FactoryGirl.define do
 
   factory :panel, :class => Panel do |panel|
     panel.border 1
-    panel.x nil
-    panel.y nil
-    panel.z nil
     panel.width 100
     panel.height 300
+    panel.caption 'panel caption'
     panel.publish 1
     panel.author_id 1
   end
@@ -206,6 +196,9 @@ FactoryGirl.define do
     story.panel_id 1
     story.author_id 1
     story.t 0
+    story.x nil
+    story.y nil
+    story.z nil
   end
 
   factory :provider, :class => Provider do |provider|
@@ -243,4 +236,23 @@ FactoryGirl.define do
     demander_status.receive_hour1 nil
     demander_status.receive_hour2 nil
   end
+
+  factory :provider_license, :class => ProviderLicense do |provider_license|
+    provider_license.provider_id nil
+    provider_license.providers_license_id nil
+    provider_license.demanders_license_id nil
+  end
+
+  factory :provider_artist, :class => ProviderArtist do |provider_artist|
+    provider_artist.provider_id nil
+    provider_artist.providers_artist_id nil
+    provider_artist.demanders_artist_id nil
+  end
+
+  factory :provider_original_picture, :class => ProviderOriginalPicture do |provider_original_picture|
+    provider_original_picture.provider_id nil
+    provider_original_picture.providers_original_picture_id nil
+    provider_original_picture.demanders_original_picture_id nil
+  end
+
 end