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
t#29061/t#29089/t#29076:add mylist. modify panel picture
[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
b3c9c92
..
af576ec
100644
(file)
--- a/
spec/models/speech_balloon_spec.rb
+++ b/
spec/models/speech_balloon_spec.rb
@@
-4,13
+4,13
@@
require 'spec_helper'
describe SpeechBalloon do
before do
describe SpeechBalloon do
before do
- Factory :admin
- @user = Factory( :user_yas)
+ Factory
Girl.create
:admin
+ @user = Factory
Girl.create
( :user_yas)
@author = @user.author
@author = @user.author
- @artist = Factory :artist_yas, :author_id => @author.id
+ @artist = Factory
Girl.create
:artist_yas, :author_id => @author.id
- @panel = Factory :panel, :author_id => @author.id
- @speech_balloon_template = Factory :speech_balloon_template
+ @panel = Factory
Girl.create
:panel, :author_id => @author.id
+ @speech_balloon_template = Factory
Girl.create
:speech_balloon_template
end
describe '検証に於いて' do
end
describe '検証に於いて' do
@@
-18,13
+18,13
@@
describe SpeechBalloon do
end
it 'オーソドックスなデータなら通る' do
end
it 'オーソドックスなデータなら通る' do
- @sb = Factory.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
+ @sb = Factory
Girl
.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
@sb.should be_valid
end
context 'panel_idを検証するとき' do
before do
@sb.should be_valid
end
context 'panel_idを検証するとき' do
before do
- @sb = Factory.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
+ @sb = Factory
Girl
.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
end
#ネストの保存はnilを許可しなければならないので数値チェックだけ
it 'テストデータの確認' do
end
#ネストの保存はnilを許可しなければならないので数値チェックだけ
it 'テストデータの確認' do
@@
-38,7
+38,7
@@
describe SpeechBalloon do
end
context 'speech_balloon_template_idを検証するとき' do
before do
end
context 'speech_balloon_template_idを検証するとき' do
before do
- @sb = Factory.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
+ @sb = Factory
Girl
.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
end
it 'テストデータの確認' do
@sb.speech_balloon_template_id = @speech_balloon_template.id
end
it 'テストデータの確認' do
@sb.speech_balloon_template_id = @speech_balloon_template.id
@@
-59,7
+59,7
@@
describe SpeechBalloon do
end
context 'classnameを検証するとき' do
before do
end
context 'classnameを検証するとき' do
before do
- @sb = Factory.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
+ @sb = Factory
Girl
.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
end
it 'テストデータの確認' do
@sb.classname = 'abcdefghi0abcdefghi0abcdefghi0abcdefghi0abcdefghi0'
end
it 'テストデータの確認' do
@sb.classname = 'abcdefghi0abcdefghi0abcdefghi0abcdefghi0abcdefghi0'
@@
-76,7
+76,7
@@
describe SpeechBalloon do
end
context 'tを検証するとき' do
before do
end
context 'tを検証するとき' do
before do
- @sb = Factory.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
+ @sb = Factory
Girl
.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
end
it 'テストデータの確認' do
@sb.t = 0
end
it 'テストデータの確認' do
@sb.t = 0
@@
-97,7
+97,7
@@
describe SpeechBalloon do
end
context 'settingsを検証するとき' do
before do
end
context 'settingsを検証するとき' do
before do
- @sb = Factory.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
+ @sb = Factory
Girl
.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
end
it 'テストデータの確認' do
@sb.settings = '{}'
end
it 'テストデータの確認' do
@sb.settings = '{}'