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 v04
[pettanr/pettanr.git]
/
spec
/
models
/
speech_balloon_spec.rb
diff --git
a/spec/models/speech_balloon_spec.rb
b/spec/models/speech_balloon_spec.rb
index
c7392fb
..
b3c9c92
100644
(file)
--- a/
spec/models/speech_balloon_spec.rb
+++ b/
spec/models/speech_balloon_spec.rb
@@
-8,7
+8,6
@@
describe SpeechBalloon do
@user = Factory( :user_yas)
@author = @user.author
@artist = Factory :artist_yas, :author_id => @author.id
@user = Factory( :user_yas)
@author = @user.author
@artist = Factory :artist_yas, :author_id => @author.id
- @license = Factory :license
@panel = Factory :panel, :author_id => @author.id
@speech_balloon_template = Factory :speech_balloon_template
@panel = Factory :panel, :author_id => @author.id
@speech_balloon_template = Factory :speech_balloon_template
@@
-27,6
+26,7
@@
describe SpeechBalloon do
before do
@sb = Factory.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
end
before do
@sb = Factory.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
end
+ #ネストの保存はnilを許可しなければならないので数値チェックだけ
it 'テストデータの確認' do
@sb.panel_id = @panel.id
@sb.should be_valid
it 'テストデータの確認' do
@sb.panel_id = @panel.id
@sb.should be_valid