Merge branch 'v05' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v05

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

diff --git a/spec/factories.rb b/spec/factories.rb
index ff73e07..3dba65e 100644 (file)
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -79,6 +79,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|
@@ -192,9 +194,6 @@ 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.publish 1
@@ -206,6 +205,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|