fix peta spec

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

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