t#29061/t#29089/t#29076:add mylist. modify panel picture

[pettanr/pettanr.git] / spec / models / speech_balloon_template_spec.rb

diff --git a/spec/models/speech_balloon_template_spec.rb b/spec/models/speech_balloon_template_spec.rb
index e4fb938..c478800 100644 (file)
--- a/spec/models/speech_balloon_template_spec.rb
+++ b/spec/models/speech_balloon_template_spec.rb
@@ -14,7 +14,7 @@ describe SpeechBalloonTemplate do
     @tes = File.open(@fes, 'r').read
     @jes = JSON.parse @tes
     
-    @admin = Factory :admin
+    @admin = FactoryGirl.create :admin
   end
   
   describe '検証に於いて' do
@@ -22,13 +22,13 @@ describe SpeechBalloonTemplate do
     end
     
     it 'オーソドックスなデータなら通る' do
-      @st = Factory.build :speech_balloon_template
+      @st = FactoryGirl.build :speech_balloon_template
       @st.should be_valid
     end
     
     context 'nameを検証するとき' do
       before do
-        @st = Factory.build :speech_balloon_template
+        @st = FactoryGirl.build :speech_balloon_template
       end
       it 'テストデータの確認' do
         @st.name = 'abcdefghi0abcdefghi0abcdefghi0abcdefghi0abcdefghi0'
@@ -45,7 +45,7 @@ describe SpeechBalloonTemplate do
     end
     context 'classnameを検証するとき' do
       before do
-        @st = Factory.build :speech_balloon_template
+        @st = FactoryGirl.build :speech_balloon_template
       end
       it 'テストデータの確認' do
         @st.classname = 'abcdefghi0abcdefghi0abcdefghi0abcdefghi0abcdefghi0'
@@ -62,7 +62,7 @@ describe SpeechBalloonTemplate do
     end
     context 'captionを検証するとき' do
       before do
-        @st = Factory.build :speech_balloon_template
+        @st = FactoryGirl.build :speech_balloon_template
       end
       it 'テストデータの確認' do
         @st.caption = 'abcdefghi0abcdefghi0abcdefghi0'
@@ -79,7 +79,7 @@ describe SpeechBalloonTemplate do
     end
     context 'tを検証するとき' do
       before do
-        @st = Factory.build :speech_balloon_template
+        @st = FactoryGirl.build :speech_balloon_template
       end
       it 'テストデータの確認' do
         @st.t = 0
@@ -100,7 +100,7 @@ describe SpeechBalloonTemplate do
     end
     context 'settingsを検証するとき' do
       before do
-        @st = Factory.build :speech_balloon_template
+        @st = FactoryGirl.build :speech_balloon_template
       end
       it 'テストデータの確認' do
         @st.settings = '{}'
@@ -143,9 +143,9 @@ describe SpeechBalloonTemplate do
   
   describe 'システム画像置換に於いて' do
     before do
-      @sp = Factory :system_picture
-      @sp2 = Factory :system_picture
-      @st = Factory.build :speech_balloon_template
+      @sp = FactoryGirl.create :system_picture
+      @sp2 = FactoryGirl.create :system_picture
+      @st = FactoryGirl.build :speech_balloon_template
       @hash = {"classname" => 'sore', "caption" => 'store test',
         "templates" => {
           "one" => {"balloon" => {"system_picture" => 'BASE64'}}
@@ -241,7 +241,7 @@ describe SpeechBalloonTemplate do
   
   describe 'フキダシテンプレート保存に於いて' do
     before do
-      @st = Factory.build :speech_balloon_template
+      @st = FactoryGirl.build :speech_balloon_template
       @hash = {"classname" => 'sore', "caption" => 'store test'}
     end
     context '事前チェック' do
@@ -296,7 +296,7 @@ describe SpeechBalloonTemplate do
   
   describe 'フキダシテンプレート更新に於いて' do
     before do
-      @st = Factory :speech_balloon_template
+      @st = FactoryGirl.create :speech_balloon_template
       @hash = {}
     end
     context 'つつがなく終わるとき' do