OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge
[pettanr/pettanr.git]
/
spec
/
factories.rb
diff --git
a/spec/factories.rb
b/spec/factories.rb
index
03358af
..
8500814
100644
(file)
--- a/
spec/factories.rb
+++ b/
spec/factories.rb
@@
-61,14
+61,9
@@
FactoryGirl.define do
license.system_picture_id 1
end
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"
factory :comic, :class => Comic do |comic|
comic.title "comic"
+ comic.description 'comic description'
comic.visible 1
end
comic.visible 1
end
@@
-129,6
+124,7
@@
FactoryGirl.define do
sbt.classname 'Plain'
sbt.caption 'normal fuki'
sbt.t 0
sbt.classname 'Plain'
sbt.caption 'normal fuki'
sbt.t 0
+ sbt.system_picture_id 1
sbt.settings '{}'
end
sbt.settings '{}'
end
@@
-139,6
+135,7
@@
FactoryGirl.define do
sb.z 1
sb.t 0
sb.settings '{}'
sb.z 1
sb.t 0
sb.settings '{}'
+ sb.caption 'test pict'
end
factory :balloon, :class => Balloon do |balloon|
end
factory :balloon, :class => Balloon do |balloon|
@@
-148,7
+145,6
@@
FactoryGirl.define do
balloon.y 200
balloon.width 222
balloon.height 333
balloon.y 200
balloon.width 222
balloon.height 333
- balloon.caption 'test pict'
balloon.settings nil
end
balloon.settings nil
end
@@
-174,15
+170,9
@@
FactoryGirl.define do
pp.height 300
end
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
factory :ground_color, :class => GroundColor do |gc|
gc.panel_id 1
- gc.co
lor_id
1
+ gc.co
de
1
gc.z 1
end
gc.z 1
end
@@
-194,11
+184,9
@@
FactoryGirl.define do
factory :panel, :class => Panel do |panel|
panel.border 1
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.width 100
panel.height 300
+ panel.caption 'panel caption'
panel.publish 1
panel.author_id 1
end
panel.publish 1
panel.author_id 1
end
@@
-208,6
+196,9
@@
FactoryGirl.define do
story.panel_id 1
story.author_id 1
story.t 0
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|
end
factory :provider, :class => Provider do |provider|