\r
describe Speech do\r
before do\r
+ SpeechBalloonTemplate.delete_all\r
@admin = FactoryGirl.create :admin\r
@user = FactoryGirl.create( :user_yas)\r
@author = FactoryGirl.create :author, :user_id => @user.id\r
@lg = FactoryGirl.create :license_group\r
@license = FactoryGirl.create :license, :license_group_id => @lg.id, :system_picture_id => @sp.id\r
\r
- @speech_balloon_template = FactoryGirl.create :speech_balloon_template\r
+ @writing_format = FactoryGirl.create :writing_format\r
+ SpeechBalloonTemplate.delete_all\r
+ @speech_balloon_template = FactoryGirl.create :speech_balloon_template, "name" => "circle@pettan.com", "classname" => "CircleSpeechBalloon", "caption" => "cc", "system_picture_id" => @sp.id, "settings" => '{}'\r
@panel = FactoryGirl.create :panel, :author_id => @author.id\r
end\r
\r
describe '検証に於いて' do\r
before do\r
- @sb = FactoryGirl.create :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
- @balloon = FactoryGirl.create :balloon, :speech_balloon_id => @sb.id, :system_picture_id => @sp.id\r
- @speech = FactoryGirl.build :speech, :speech_balloon_id => @sb.id\r
+ @sb = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech = @sb.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id)\r
+ )\r
+ @balloon = @sb.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb.boost\r
+ @sb.save!\r
end\r
\r
context 'オーソドックスなデータのとき' do\r
it '下限データが通る' do\r
+ @speech.font_size = 1.0\r
+ @speech.text_align = 0\r
+ @speech.fore_color = 0\r
@speech.x = 0\r
@speech.y = 0\r
@speech.width = 1\r
@speech.height = 1\r
+ @speech.quotes = ''\r
@speech.should be_valid\r
end\r
it '上限データが通る' do\r
+ @speech.font_size = 99999.0\r
+ @speech.text_align = 3\r
+ @speech.fore_color = 0xffffff\r
@speech.x = 99999\r
@speech.y = 99999\r
@speech.width = 99999\r
@speech.height = 99999\r
+ @speech.quotes = '[ ] [ ] [ ] [ ]'\r
@speech.should be_valid\r
end\r
end\r
end\r
context 'contentを検証するとき' do\r
end\r
+ context 'font_sizeを検証するとき' do\r
+ it 'nullなら失敗する' do\r
+ @speech.font_size = nil\r
+ @speech.should_not be_valid\r
+ end\r
+ it '数値でなければ失敗する' do\r
+ @speech.font_size = 'a'\r
+ @speech.should_not be_valid\r
+ end\r
+ it '0なら通る' do\r
+ @speech.font_size = '0'\r
+ @speech.should be_valid\r
+ end\r
+ it '10.5なら通る' do\r
+ @speech.font_size = '0'\r
+ @speech.should be_valid\r
+ end\r
+ it '負なら失敗する' do\r
+ @speech.font_size = 10.5\r
+ @speech.should be_valid\r
+ end\r
+ end\r
+ context 'text_alignを検証するとき' do\r
+ it 'nullなら失敗する' do\r
+ @speech.text_align = nil\r
+ @speech.should_not be_valid\r
+ end\r
+ it '数値でなければ失敗する' do\r
+ @speech.text_align = 'a'\r
+ @speech.should_not be_valid\r
+ end\r
+ it '0なら通る' do\r
+ @speech.text_align = '0'\r
+ @speech.should be_valid\r
+ end\r
+ it '負なら失敗する' do\r
+ @speech.text_align = -1\r
+ @speech.should_not be_valid\r
+ end\r
+ it '4なら失敗する' do\r
+ @speech.text_align = 4\r
+ @speech.should_not be_valid\r
+ end\r
+ end\r
+ context 'fore_colorを検証するとき' do\r
+ it 'nullなら失敗する' do\r
+ @speech.fore_color = nil\r
+ @speech.should_not be_valid\r
+ end\r
+ it '数値でなければ失敗する' do\r
+ @speech.fore_color = 'a'\r
+ @speech.should_not be_valid\r
+ end\r
+ it '0なら通る' do\r
+ @speech.fore_color = '0'\r
+ @speech.should be_valid\r
+ end\r
+ it '負なら失敗する' do\r
+ @speech.fore_color = -1\r
+ @speech.should_not be_valid\r
+ end\r
+ it '24bit colorでなければ失敗する' do\r
+ @speech.fore_color = 0x1000000\r
+ @speech.should_not be_valid\r
+ end\r
+ end\r
context 'xを検証するとき' do\r
it 'nullなら失敗する' do\r
@speech.x = nil\r
@speech.should_not be_valid\r
end\r
end\r
+ context 'quotesを検証するとき' do\r
+ it '奇数なら失敗する' do\r
+ @speech.quotes = '[ ] ['\r
+ @speech.should_not be_valid\r
+ end\r
+ it '16文字以上なら失敗する' do\r
+ @speech.quotes = '[ ] [ ] [ ] [ ] [ ]'\r
+ @speech.should_not be_valid\r
+ end\r
+ end\r
+ context 'settingsを検証するとき' do\r
+ end\r
+ end\r
+ \r
+ describe '文字コード検証に於いて' do\r
+ before do\r
+ @sb = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech = @sb.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id)\r
+ )\r
+ @balloon = @sb.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb.boost\r
+ @sb.save!\r
+ end\r
+ \r
+ context 'contentを検証するとき' do\r
+ it 'Shift JISなら失敗する' do\r
+ @speech.content = "\x83G\x83r\x83]\x83D"\r
+ lambda{\r
+ @speech.valid_encode\r
+ }.should raise_error(Pettanr::BadRequest)\r
+ end\r
+ end\r
+ \r
+ context 'quotesを検証するとき' do\r
+ it 'Shift JISなら失敗する' do\r
+ @speech.quotes = "\x83G \x83r \x83 ]\x83D"\r
+ lambda{\r
+ @speech.valid_encode\r
+ }.should raise_error(Pettanr::BadRequest)\r
+ end\r
+ end\r
+ \r
context 'settingsを検証するとき' do\r
+ it 'Shift JISなら失敗する' do\r
+ @speech.settings = "\x83G\x83r\x83]\x83D"\r
+ lambda{\r
+ @speech.valid_encode\r
+ }.should raise_error(Pettanr::BadRequest)\r
+ end\r
end\r
end\r
\r
describe '閲覧許可に於いて' do\r
before do\r
- @sb = FactoryGirl.create :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
- @balloon = FactoryGirl.create :balloon, :speech_balloon_id => @sb.id, :system_picture_id => @sp.id\r
- @speech = FactoryGirl.create :speech, :speech_balloon_id => @sb.id\r
- end\r
- context '検査対象がnil(ゲスト)のとき' do\r
- context 'クローズドモードのとき' do\r
- before do\r
- MagicNumber['run_mode'] = 1\r
- end\r
- it '不許可を返す。' do\r
- r = @speech.visible?(nil)\r
- r.should be_false\r
- end\r
+ @sb = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech = @sb.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id)\r
+ )\r
+ @balloon = @sb.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb.boost\r
+ @sb.save!\r
+ end\r
+ context 'オープンモードのとき' do\r
+ before do\r
+ MagicNumber['run_mode'] = 0\r
end\r
- context 'オープンモードのとき' do\r
- before do\r
- MagicNumber['run_mode'] = 0\r
- end\r
- it '公開されたコマのセリフなら許可する' do\r
- SpeechBalloon.any_instance.stub(:visible?).with(any_args).and_return(true)\r
- r = @speech.visible?(nil)\r
- r.should be_true\r
- end\r
- it 'れ以外なら不許可を返す' do\r
- SpeechBalloon.any_instance.stub(:visible?).with(any_args).and_return(false)\r
- r = @speech.visible?(nil)\r
- r.should be_false\r
- end\r
+ it '自身にゲスト用ロールチェックを問い合わせしている' do\r
+ Speech.any_instance.stub(:guest_role_check).and_return(true)\r
+ Speech.any_instance.should_receive(:guest_role_check).with(any_args).exactly(1)\r
+ r = @speech.visible?([@author])\r
+ end\r
+ it 'ゲスト用ロールチェックが失敗したとき、falseを返す' do\r
+ Speech.any_instance.stub(:guest_role_check).and_return(false)\r
+ r = @speech.visible?([@author])\r
+ r.should be_false\r
end\r
end\r
- context '検査対象が作家のとき' do\r
- it '公開されたコマのセリフなら許可する' do\r
- SpeechBalloon.any_instance.stub(:visible?).with(any_args).and_return(true)\r
- r = @speech.visible?(@author)\r
- r.should be_true\r
+ context 'クローズドモードのとき' do\r
+ before do\r
+ MagicNumber['run_mode'] = 1\r
end\r
- it 'れ以外なら不許可を返す' do\r
- SpeechBalloon.any_instance.stub(:visible?).with(any_args).and_return(false)\r
- r = @speech.visible?(@author)\r
+ it '自身に読者用ロールチェックを問い合わせしている' do\r
+ Speech.any_instance.stub(:reader_role_check).and_return(true)\r
+ Speech.any_instance.should_receive(:reader_role_check).with(any_args).exactly(1)\r
+ r = @speech.visible?([@author])\r
+ end\r
+ it '読者用ロールチェックが失敗したとき、falseを返す' do\r
+ Speech.any_instance.stub(:reader_role_check).and_return(false)\r
+ r = @speech.visible?([@author])\r
r.should be_false\r
end\r
end\r
- context '検査対象が管理者のとき' do\r
- it '許可を返す。' do\r
- SpeechBalloon.any_instance.stub(:visible?).with(any_args).and_return(false)\r
- r = @speech.visible?(@admin)\r
- r.should be_true\r
+ context '事前チェックする' do\r
+ before do\r
+ MagicNumber['run_mode'] = 1\r
+ Speech.any_instance.stub(:reader_role_check).and_return(true)\r
+ end\r
+ it '自身のコマに所持判定を問い合わせしている' do\r
+ Panel.any_instance.stub(:own?).and_return(true)\r
+ Panel.any_instance.should_receive(:own?).with(any_args).exactly(1)\r
+ r = @speech.visible?([@author])\r
+ end\r
+ it '自身のコマに閲覧許可を問い合わせしている' do\r
+ Panel.any_instance.stub(:own?).and_return(false)\r
+ Panel.any_instance.stub(:visible?).and_return(true)\r
+ Panel.any_instance.should_receive(:visible?).with(any_args).exactly(1)\r
+ r = @speech.visible?([@author])\r
end\r
end\r
- context '検査対象がそれ以外のとき' do\r
- it '不許可を返す。' do\r
- r = @speech.visible?(1)\r
+ context 'つつがなく終わるとき' do\r
+ before do\r
+ MagicNumber['run_mode'] = 1\r
+ Panel.any_instance.stub(:reader_role_check).and_return(true)\r
+ end\r
+ it '自分のコマのセリフなら許可する' do\r
+ Panel.any_instance.stub(:own?).and_return(true)\r
+ Panel.any_instance.stub(:visible?).and_return(false)\r
+ r = @speech.visible?([@author])\r
+ r.should be_true\r
+ end\r
+ it '他人の非公開コマのセリフなら許可しない' do\r
+ Panel.any_instance.stub(:own?).and_return(false)\r
+ Panel.any_instance.stub(:visible?).and_return(false)\r
+ r = @speech.visible?([@author])\r
r.should be_false\r
end\r
+ it '他人のコマのセリフでも公開なら許可する' do\r
+ Panel.any_instance.stub(:own?).and_return(false)\r
+ Panel.any_instance.stub(:visible?).and_return(true)\r
+ r = @speech.visible?([@author])\r
+ r.should be_true\r
+ end\r
end\r
end\r
+ \r
describe '一覧取得に於いて' do\r
before do\r
- @sb = FactoryGirl.create :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
- @balloon = FactoryGirl.create :balloon, :speech_balloon_id => @sb.id, :system_picture_id => @sp.id\r
- @speech = FactoryGirl.create :speech, :speech_balloon_id => @sb.id\r
+ @sb = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech = @sb.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id)\r
+ )\r
+ @balloon = @sb.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb.boost\r
+ @sb.save!\r
end\r
context 'page補正について' do\r
it '文字列から数値に変換される' do\r
it '時系列で並んでいる' do\r
#公開されたコマのセリフは(他人のセリフであっても)含んでいる\r
hc = FactoryGirl.create :panel, :author_id => @other_author.id, :publish => 1\r
- nsb = FactoryGirl.create :speech_balloon, :panel_id => hc.id, :speech_balloon_template_id => @speech_balloon_template.id, :updated_at => Time.now + 100\r
- npl = FactoryGirl.create :speech, :speech_balloon_id => nsb.id, :updated_at => Time.now + 100\r
+ nsb = FactoryGirl.build :speech_balloon, :panel_id => hc.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ npl = nsb.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id, :updated_at => Time.now + 100)\r
+ )\r
+ nsb.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ nsb.boost\r
+ nsb.save!\r
r = Speech.list\r
r.should eq [npl, @speech]\r
end\r
it '非公開のコマのセリフは自分のセリフであっても含まない' do\r
hc = FactoryGirl.create :panel, :author_id => @author.id, :publish => 0\r
- nsb = FactoryGirl.create :speech_balloon, :panel_id => hc.id, :speech_balloon_template_id => @speech_balloon_template.id, :updated_at => Time.now + 100\r
- npl = FactoryGirl.create :speech, :speech_balloon_id => nsb.id, :updated_at => Time.now + 100\r
+ nsb = FactoryGirl.build :speech_balloon, :panel_id => hc.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ npl = nsb.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id, :updated_at => Time.now + 100)\r
+ )\r
+ nsb.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ nsb.boost\r
+ nsb.save!\r
pl = Speech.list\r
pl.should eq [@speech]\r
end\r
context 'DBに5件あって1ページの件数を2件に変えたとして' do\r
before do\r
- @speech2 = FactoryGirl.create :speech, :speech_balloon_id => @sb.id, :updated_at => Time.now + 100\r
- @speech3 = FactoryGirl.create :speech, :speech_balloon_id => @sb.id, :updated_at => Time.now + 200\r
- @speech4 = FactoryGirl.create :speech, :speech_balloon_id => @sb.id, :updated_at => Time.now + 300\r
- @speech5 = FactoryGirl.create :speech, :speech_balloon_id => @sb.id, :updated_at => Time.now + 400\r
+ @sb2 = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech2 = @sb2.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id, :updated_at => Time.now + 100)\r
+ )\r
+ @balloon2 = @sb2.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb2.boost\r
+ @sb2.save!\r
+ @sb3 = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech3 = @sb3.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id, :updated_at => Time.now + 200)\r
+ )\r
+ @balloon3 = @sb3.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb3.boost\r
+ @sb3.save!\r
+ @sb4 = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech4 = @sb4.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id, :updated_at => Time.now + 300)\r
+ )\r
+ @balloon4 = @sb4.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb4.boost\r
+ @sb4.save!\r
+ @sb5 = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech5 = @sb5.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id, :updated_at => Time.now + 400)\r
+ )\r
+ @balloon5 = @sb5.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb5.boost\r
+ @sb5.save!\r
Speech.stub(:default_page_size).and_return(2)\r
end\r
it '通常は2件を返す' do\r
end\r
context 'DBに5件あって1ページの件数を0件に変えたとして' do\r
before do\r
- @speech2 = FactoryGirl.create :speech, :speech_balloon_id => @sb.id, :updated_at => Time.now + 100\r
- @speech3 = FactoryGirl.create :speech, :speech_balloon_id => @sb.id, :updated_at => Time.now + 200\r
- @speech4 = FactoryGirl.create :speech, :speech_balloon_id => @sb.id, :updated_at => Time.now + 300\r
- @speech5 = FactoryGirl.create :speech, :speech_balloon_id => @sb.id, :updated_at => Time.now + 400\r
+ @sb2 = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech2 = @sb2.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id, :updated_at => Time.now + 100)\r
+ )\r
+ @balloon2 = @sb2.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb2.boost\r
+ @sb2.save!\r
+ @sb3 = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech3 = @sb3.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id, :updated_at => Time.now + 200)\r
+ )\r
+ @balloon3 = @sb3.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb3.boost\r
+ @sb3.save!\r
+ @sb4 = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech4 = @sb4.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id, :updated_at => Time.now + 300)\r
+ )\r
+ @balloon4 = @sb4.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb4.boost\r
+ @sb4.save!\r
+ @sb5 = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech5 = @sb5.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id, :updated_at => Time.now + 400)\r
+ )\r
+ @balloon5 = @sb5.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb5.boost\r
+ @sb5.save!\r
Speech.stub(:default_page_size).and_return(2)\r
end\r
it '通常は全件(5件)を返す' do\r
end\r
it 'フキダシはフキダシ枠を含んでいる' do\r
r = Speech.list_opt[:include]\r
- r[:speech_balloon].has_key?(:balloons).should be_true\r
+ r[:speech_balloon].has_key?(:balloon).should be_true\r
end\r
it 'フキダシはフキダシテンプレートを含んでいる' do\r
r = Speech.list_opt[:include]\r
end\r
describe 'json一覧出力オプションに於いて' do\r
before do\r
- @sb = FactoryGirl.create :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
- @balloon = FactoryGirl.create :balloon, :speech_balloon_id => @sb.id, :system_picture_id => @sp.id\r
- @speech = FactoryGirl.create :speech, :speech_balloon_id => @sb.id\r
+ @sb = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech = @sb.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id)\r
+ )\r
+ @balloon = @sb.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb.boost\r
+ @sb.save!\r
end\r
it 'フキダシを含んでいる' do\r
r = Speech.list.to_json Speech.list_json_opt\r
j = JSON.parse r\r
i = j.first\r
s = i['speech_balloon']\r
- s.has_key?('balloons').should be_true\r
+ s.has_key?('balloon').should be_true\r
end\r
it 'フキダシはフキダシテンプレートを含んでいる' do\r
r = Speech.list.to_json Speech.list_json_opt\r
\r
describe '単体取得に於いて' do\r
before do\r
- @sb = FactoryGirl.create :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
- @balloon = FactoryGirl.create :balloon, :speech_balloon_id => @sb.id, :system_picture_id => @sp.id\r
- @speech = FactoryGirl.create :speech, :speech_balloon_id => @sb.id\r
+ @sb = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech = @sb.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id)\r
+ )\r
+ @balloon = @sb.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb.boost\r
+ @sb.save!\r
end\r
context 'つつがなく終わるとき' do\r
it '単体取得オプションを利用している' do\r
end\r
it 'フキダシはフキダシ枠を含んでいる' do\r
r = Speech.show_opt[:include]\r
- r[:speech_balloon].has_key?(:balloons).should be_true\r
+ r[:speech_balloon].has_key?(:balloon).should be_true\r
end\r
it 'フキダシはフキダシテンプレートを含んでいる' do\r
r = Speech.show_opt[:include]\r
end\r
describe 'json単体出力オプションに於いて' do\r
before do\r
- @sb = FactoryGirl.create :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
- @balloon = FactoryGirl.create :balloon, :speech_balloon_id => @sb.id, :system_picture_id => @sp.id\r
- @speech = FactoryGirl.create :speech, :speech_balloon_id => @sb.id\r
+ @sb = FactoryGirl.build :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id\r
+ @speech = @sb.build_speech(\r
+ FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id)\r
+ )\r
+ @balloon = @sb.build_balloon(\r
+ FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id)\r
+ )\r
+ @sb.boost\r
+ @sb.save!\r
end\r
it 'フキダシを含んでいる' do\r
r = Speech.show(@speech.id, @author).to_json Speech.show_json_opt\r
r = Speech.show(@speech.id, @author).to_json Speech.show_json_opt\r
j = JSON.parse r\r
i = j['speech_balloon']\r
- i.has_key?('balloons').should be_true\r
+ i.has_key?('balloon').should be_true\r
end\r
it 'フキダシテンプレートを含んでいる' do\r
r = Speech.show(@speech.id, @author).to_json Speech.show_json_opt\r
OSDN Git Service
