X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=spec%2Ffactories.rb;h=1a66ab114ab06817f134c8ca0e256a5d357d4891;hb=de50e82e590f248cfc016f5187d2027c4d52045f;hp=03358af0ae0aafa653fdad7748e3f19bcfcf148b;hpb=fb5769ff710c952a6b9ed3ce2ee74a6dfdc334cf;p=pettanr%2Fpettanr.git

diff --git a/spec/factories.rb b/spec/factories.rb
index 03358af0..1a66ab11 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -61,15 +61,66 @@ FactoryGirl.define do
     license.system_picture_id 1
   end
 
-  factory :color, :class => Color do |color|
-    color.name 'black'
-    color.code 0
-    color.t 0
+  factory :writing_format, :class => WritingFormat do |writing_format|
+    writing_format.name 'simple_format@pettan.com'
+    writing_format.classname 'SimpleFormat'
+    writing_format.caption 'sl'
+    writing_format.system_picture_id 1 
+    writing_format.settings '{}'
+  end
+
+  factory :scroll, :class => Scroll do |scroll|
+    scroll.title "scroll"
+    scroll.description 'scroll description'
+    scroll.visible 1
+    scroll.author_id 1
+  end
+
+  factory :scroll_panel, :class => ScrollPanel do |scroll_panel|
+    scroll_panel.scroll_id 1
+    scroll_panel.panel_id 1
+    scroll_panel.author_id 1
+    scroll_panel.t 0
   end
 
   factory :comic, :class => Comic do |comic|
     comic.title "comic"
+    comic.description 'comic description'
     comic.visible 1
+    comic.author_id 1
+  end
+
+  factory :story, :class => Story do |story|
+    story.comic_id 1
+    story.title "scroll"
+    story.description 'scroll description'
+    story.visible 1
+    story.t 0
+  end
+
+  factory :story_sheet, :class => StorySheet do |story_sheet|
+    story_sheet.sheet_id 1
+    story_sheet.story_id 1
+    story_sheet.t 0
+    story_sheet.author_id 1
+  end
+
+  factory :sheet, :class => Sheet do |sheet|
+    sheet.caption "sheet"
+    sheet.width 222
+    sheet.height 111
+    sheet.visible 1
+    sheet.author_id 1
+  end
+
+  factory :sheet_panel, :class => SheetPanel do |sheet_panel|
+    sheet_panel.sheet_id 1
+    sheet_panel.panel_id 1
+    sheet_panel.x 111
+    sheet_panel.y 200
+    sheet_panel.z 1
+    sheet_panel.t 0
+    sheet_panel.author_id 1
   end
 
   factory :original_picture, :class => OriginalPicture do |op|
@@ -129,6 +180,7 @@ FactoryGirl.define do
     sbt.classname 'Plain'
     sbt.caption 'normal fuki'
     sbt.t 0
+    sbt.system_picture_id 1 
     sbt.settings '{}'
   end
 
@@ -139,6 +191,7 @@ FactoryGirl.define do
     sb.z 1
     sb.t 0
     sb.settings '{}'
+    sb.caption 'test pict'
   end
 
   factory :balloon, :class => Balloon do |balloon|
@@ -148,13 +201,16 @@ FactoryGirl.define do
     balloon.y 200
     balloon.width 222 
     balloon.height 333 
-    balloon.caption 'test pict'
     balloon.settings nil
   end
 
   factory :speech, :class => Speech do |speech|
     speech.speech_balloon_id 1
+    speech.writing_format_id 1
     speech.content 'test'
+    speech.font_size 1.0
+    speech.text_align 1
+    speech.fore_color 0xffffff
     speech.x 10
     speech.y 100
     speech.width 200
@@ -174,15 +230,10 @@ 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.orientation 0
     gc.z 1
   end
 
@@ -194,22 +245,13 @@ 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
 
-  factory :story, :class => Story do |story|
-    story.comic_id 1
-    story.panel_id 1
-    story.author_id 1
-    story.t 0
-  end
-
   factory :provider, :class => Provider do |provider|
     provider.name 'admin@penguinkingdom.com'
     provider.caption 'ペンギン王国'