merge v04

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

diff --git a/spec/models/speech_spec.rb b/spec/models/speech_spec.rb
index 821f436..2b22724 100644 (file)
--- a/spec/models/speech_spec.rb
+++ b/spec/models/speech_spec.rb
@@ -4,7 +4,9 @@ require 'spec_helper'
 describe Speech do\r
   before do\r
     Factory :admin\r
-    @license = Factory :license\r
+    @sp = Factory :system_picture
+    @lg = Factory :license_group
+    @l = Factory :license, :license_group_id => @lg.id, :system_picture_id => @sp.id
     @user = Factory( :user_yas)\r
     @author = @user.author\r
     \r
@@ -23,6 +25,7 @@ describe Speech do
       before do\r
         @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id\r
       end\r
+      #ネストの保存はnilを許可しなければならないので数値チェックだけ
       it 'テストデータの確認' do\r
         @speech.speech_balloon_id = @speech_balloon.id\r
         @speech.should be_valid\r