X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=spec%2Ffactories%2Fwriting_format.rb;h=5a66f7796deb0f821b59835182c4894d46ac6483;hb=f5768a1a49a74e5652a493a0a586b0af23da1b5a;hp=1bf0f940375747461385ed7669afc338fd2b4e5a;hpb=ac99a9d7dc6bcff459b17b1aa8d09765fc701fbb;p=pettanr%2Fpettanr.git

diff --git a/spec/factories/writing_format.rb b/spec/factories/writing_format.rb
index 1bf0f940..5a66f779 100644
--- a/spec/factories/writing_format.rb
+++ b/spec/factories/writing_format.rb
@@ -1,17 +1,29 @@
 # -*- encoding: utf-8 -*-
 FactoryGirl.define do
-  factory :writing_format001, :class => WritingFormat do |i|
+  factory :writing_format_simple_format, :class => WritingFormat do |i|
     i.name 'simple_format@pettan.com'
     i.module_name 'PettanrSimpleFormat'
     i.caption 'シンプル'
-    i.system_picture_id 48
     i.settings '{}'
+    trait :with_system_picture do
+      after(:build) do |writing_format, evaluator|
+        icon = SystemPicture.find_by_md5('8d3659feb1f01fe84d1b723c8e67aaf5') || create(:system_picture_writing_format_simple_format)
+        writing_format.system_picture_id = icon.id
+      end
+    end
+    factory :writing_format_simple_format_with_system_picture, traits: [:with_system_picture]
   end
-  factory :writing_format002, :class => WritingFormat do |i|
-    i.name 'new'
+  factory :writing_format_test, :class => WritingFormat do |i|
+    i.name 'test@pettan.com'
     i.module_name 'PettanrSimpleFormat'
-    i.caption 'neew'
-    i.system_picture_id 1
+    i.caption 'test'
     i.settings '{}'
+    trait :with_system_picture do
+      after(:build) do |writing_format, evaluator|
+        icon = SystemPicture.find_by_md5('8d3659feb1f01fe84d1b723c8e67aaf5') || create(:system_picture_writing_format_simple_format)
+        writing_format.system_picture_id = icon.id
+      end
+    end
+    factory :writing_format_test_with_system_picture, traits: [:with_system_picture]
   end
 end