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

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

diff --git a/spec/factories.rb b/spec/factories.rb
index 489f50d..6cb4f0a 100644 (file)
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,7 +1,8 @@
 Factory.define :admin, :class => Admin do |admin|
-  admin.email "admin@gmail.com"
+  admin.sequence(:email) { |n| "admin#{n}@gmail.com"}
   admin.password "admin0100"
   admin.password_confirmation "admin0100"
+  admin.approve 1
 end
 
 Factory.define :user_yas, :class => User do |user|
@@ -37,7 +38,7 @@ end
 
 Factory.define :license, :class => License do |license|
   license.name 'peta2.5'
-  license.url 'test'
+  license.url 'http://test.lc/'
   license.cc_by 0
   license.cc_sa 0
   license.cc_nd 0
@@ -48,6 +49,42 @@ Factory.define :license, :class => License do |license|
   license.keep_aspect_ratio 0
 end
 
+Factory.define :common_license, :class => CommonLicense do |license|
+  license.license_id 0
+  license.name 'peta2.1'
+  license.url 'http://test.lc/'
+  license.cc_by 0
+  license.cc_sa 0
+  license.cc_nd 0
+  license.cc_nc 0
+  license.no_resize 0
+  license.no_flip 0
+  license.no_convert 0
+  license.keep_aspect_ratio 0
+end
+
+Factory.define :original_license, :class => OriginalLicense do |license|
+  license.license_id 0
+  license.name 'peta2.1'
+  license.url 'http://test.olc/'
+  license.cc_by 0
+  license.cc_sa 0
+  license.cc_nd 0
+  license.cc_nc 0
+  license.no_resize 0
+  license.no_flip 0
+  license.no_convert 0
+  license.keep_aspect_ratio 0
+end
+
+Factory.define :comic, :class => Comic do |comic|
+  comic.title "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
@@ -120,15 +157,15 @@ Factory.define :balloon, :class => Balloon do |balloon|
   balloon.height 333 
 end
 
-Factory.define :speach, :class => Speach do |speach|
-  speach.balloon_id 1
-  speach.speach_template_id 1
-  speach.content 'test'
-  speach.x 10
-  speach.y 100
-  speach.t 0
-  speach.width 200
-  speach.height 190
+Factory.define :speech, :class => Speech do |speech|
+  speech.balloon_id 1
+  speech.speech_template_id 1
+  speech.content 'test'
+  speech.x 10
+  speech.y 100
+  speech.t 0
+  speech.width 200
+  speech.height 190
 end
 
 Factory.define :panel_picture, :class => PanelPicture do |pp|
@@ -145,11 +182,11 @@ end
 
 Factory.define :panel, :class => Panel do |panel|
   panel.comic_id 1
-  panel.resource_picture_id 1
+  panel.resource_picture_id nil
   panel.border 1
-  panel.x 111
-  panel.y 200
-  panel.z 1
+  panel.x nil
+  panel.y nil
+  panel.z nil
   panel.t 0
   panel.width 100
   panel.height 300