OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
[pettanr/pettanr.git] / spec / models / balloon_spec.rb
index 9749500..a7f8a34 100644 (file)
@@ -3,6 +3,7 @@ require 'spec_helper'
 #フキダシ枠\r
 describe Balloon 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
@@ -14,15 +15,23 @@ describe Balloon do
     @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
+    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
+    @writing_format = FactoryGirl.create :writing_format\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
-      @speech = FactoryGirl.create :speech, :speech_balloon_id => @sb.id\r
-      @balloon = FactoryGirl.build :balloon, :speech_balloon_id => @sb.id, :system_picture_id => @sp.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
@@ -30,6 +39,7 @@ describe Balloon do
         @balloon.y = 0\r
         @balloon.width = 1\r
         @balloon.height = 1\r
+        @balloon.r = 0\r
         @balloon.should be_valid\r
       end\r
       it '上限データが通る' do\r
@@ -37,6 +47,7 @@ describe Balloon do
         @balloon.y = 99999\r
         @balloon.width = 99999\r
         @balloon.height = 99999\r
+        @balloon.r = 99999\r
         @balloon.should be_valid\r
       end\r
     end\r
@@ -138,73 +149,147 @@ describe Balloon do
         @balloon.should_not be_valid\r
       end\r
     end\r
+    context 'rを検証するとき' do\r
+      it 'nullなら失敗する' do\r
+        @balloon.r = nil\r
+        @balloon.should_not be_valid\r
+      end\r
+      it '数値でなければ失敗する' do\r
+        @balloon.r = 'a'\r
+        @balloon.should_not be_valid\r
+      end\r
+      it '0なら通る' do\r
+        @balloon.r = '0'\r
+        @balloon.should be_valid\r
+      end\r
+      it '負でも通る' do\r
+        @balloon.r = -1\r
+        @balloon.should 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 'settingsを検証するとき' do\r
+      it 'Shift JISなら失敗する' do\r
+        @balloon.settings = "\x83G\x83r\x83]\x83D"\r
+        lambda{\r
+          @balloon.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 = @balloon.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 = @balloon.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 = @balloon.visible?(nil)\r
-          r.should be_false\r
-        end\r
+      it '自身にゲスト用ロールチェックを問い合わせしている' do\r
+        Balloon.any_instance.stub(:guest_role_check).and_return(true)\r
+        Balloon.any_instance.should_receive(:guest_role_check).with(any_args).exactly(1)\r
+        r = @balloon.visible?([@author])\r
+      end\r
+      it 'ゲスト用ロールチェックが失敗したとき、falseを返す' do\r
+        Balloon.any_instance.stub(:guest_role_check).and_return(false)\r
+        r = @balloon.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 = @balloon.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 = @balloon.visible?(@author)\r
+      it '自身に読者用ロールチェックを問い合わせしている' do\r
+        Balloon.any_instance.stub(:reader_role_check).and_return(true)\r
+        Balloon.any_instance.should_receive(:reader_role_check).with(any_args).exactly(1)\r
+        r = @balloon.visible?([@author])\r
+      end\r
+      it '読者用ロールチェックが失敗したとき、falseを返す' do\r
+        Balloon.any_instance.stub(:reader_role_check).and_return(false)\r
+        r = @balloon.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 = @balloon.visible?(@admin)\r
-        r.should be_true\r
+    context '事前チェックする' do\r
+      before do\r
+        MagicNumber['run_mode'] = 1\r
+        Balloon.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 = @balloon.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 = @balloon.visible?([@author])\r
       end\r
     end\r
-    context '検査対象がそれ以外のとき' do\r
-      it '不許可を返す。' do\r
-        r = @balloon.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 = @balloon.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 = @balloon.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 = @balloon.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
@@ -245,24 +330,70 @@ describe Balloon do
     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 :balloon, :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, :updated_at => Time.now + 100\r
+      nsb.build_speech(\r
+        FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id)\r
+      )\r
+      npl =nsb.build_balloon(\r
+        FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id, :updated_at => Time.now + 100)\r
+      )\r
+      nsb.boost\r
+      nsb.save!\r
       r = Balloon.list\r
       r.should eq [npl, @balloon]\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 :balloon, :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, :updated_at => Time.now + 100\r
+      nsb.build_speech(\r
+        FactoryGirl.attributes_for(:speech, :writing_format_id => @writing_format.id)\r
+      )\r
+      nsb.build_balloon(\r
+        FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id, :updated_at => Time.now + 100)\r
+      )\r
+      nsb.boost\r
+      nsb.save!\r
       pl = Balloon.list\r
       pl.should eq [@balloon]\r
     end\r
     context 'DBに5件あって1ページの件数を2件に変えたとして' do\r
       before do\r
-        @balloon2 = FactoryGirl.create :balloon, :speech_balloon_id => @sb.id, :updated_at => Time.now + 100\r
-        @balloon3 = FactoryGirl.create :balloon, :speech_balloon_id => @sb.id, :updated_at => Time.now + 200\r
-        @balloon4 = FactoryGirl.create :balloon, :speech_balloon_id => @sb.id, :updated_at => Time.now + 300\r
-        @balloon5 = FactoryGirl.create :balloon, :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)\r
+        )\r
+        @balloon2 = @sb2.build_balloon(\r
+          FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id, :updated_at => Time.now + 100)\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)\r
+        )\r
+        @balloon3 = @sb3.build_balloon(\r
+          FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id, :updated_at => Time.now + 200)\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)\r
+        )\r
+        @balloon4 = @sb4.build_balloon(\r
+          FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id, :updated_at => Time.now + 300)\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)\r
+        )\r
+        @balloon5 = @sb5.build_balloon(\r
+          FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id, :updated_at => Time.now + 400)\r
+        )\r
+        @sb5.boost\r
+        @sb5.save!\r
         Balloon.stub(:default_page_size).and_return(2)\r
       end\r
       it '通常は2件を返す' do\r
@@ -285,10 +416,42 @@ describe Balloon do
     end\r
     context 'DBに5件あって1ページの件数を0件に変えたとして' do\r
       before do\r
-        @balloon2 = FactoryGirl.create :balloon, :speech_balloon_id => @sb.id, :updated_at => Time.now + 100\r
-        @balloon3 = FactoryGirl.create :balloon, :speech_balloon_id => @sb.id, :updated_at => Time.now + 200\r
-        @balloon4 = FactoryGirl.create :balloon, :speech_balloon_id => @sb.id, :updated_at => Time.now + 300\r
-        @balloon5 = FactoryGirl.create :balloon, :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)\r
+        )\r
+        @balloon2 = @sb2.build_balloon(\r
+          FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id, :updated_at => Time.now + 100)\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)\r
+        )\r
+        @balloon3 = @sb3.build_balloon(\r
+          FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id, :updated_at => Time.now + 200)\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)\r
+        )\r
+        @balloon4 = @sb4.build_balloon(\r
+          FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id, :updated_at => Time.now + 300)\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)\r
+        )\r
+        @balloon5 = @sb5.build_balloon(\r
+          FactoryGirl.attributes_for(:balloon, :system_picture_id => @sp.id, :updated_at => Time.now + 400)\r
+        )\r
+        @sb5.boost\r
+        @sb5.save!\r
         Balloon.stub(:default_page_size).and_return(2)\r
       end\r
       it '通常は全件(5件)を返す' do\r
@@ -320,7 +483,7 @@ describe Balloon do
         end\r
       it 'フキダシはセリフを含んでいる' do\r
         r = Balloon.list_opt[:include]\r
-        r[:speech_balloon].has_key?(:speeches).should be_true\r
+        r[:speech_balloon].has_key?(:speech).should be_true\r
       end\r
       it 'フキダシはフキダシテンプレートを含んでいる' do\r
         r = Balloon.list_opt[:include]\r
@@ -329,9 +492,15 @@ describe Balloon do
   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 = Balloon.list.to_json Balloon.list_json_opt\r
@@ -358,7 +527,7 @@ describe Balloon do
         j = JSON.parse r\r
         i = j.first\r
         s = i['speech_balloon']\r
-        s.has_key?('speeches').should be_true\r
+        s.has_key?('speech').should be_true\r
       end\r
       it 'フキダシはフキダシテンプレートを含んでいる' do\r
         r = Balloon.list.to_json Balloon.list_json_opt\r
@@ -371,9 +540,15 @@ describe Balloon do
   \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
@@ -431,7 +606,7 @@ describe Balloon do
         end\r
       it 'フキダシはセリフを含んでいる' do\r
         r = Balloon.show_opt[:include]\r
-        r[:speech_balloon].has_key?(:speeches).should be_true\r
+        r[:speech_balloon].has_key?(:speech).should be_true\r
       end\r
       it 'フキダシはフキダシテンプレートを含んでいる' do\r
         r = Balloon.show_opt[:include]\r
@@ -440,9 +615,15 @@ describe Balloon do
   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 = Balloon.show(@balloon.id, @author).to_json Balloon.show_json_opt\r
@@ -467,7 +648,7 @@ describe Balloon do
         r = Balloon.show(@balloon.id, @author).to_json Balloon.show_json_opt\r
         j = JSON.parse r\r
         i = j['speech_balloon']\r
-        i.has_key?('speeches').should be_true\r
+        i.has_key?('speech').should be_true\r
       end\r
       it 'フキダシテンプレートを含んでいる' do\r
         r = Balloon.show(@balloon.id, @author).to_json Balloon.show_json_opt\r