t#31535::speech_balloon has one :speech and balloon

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

diff --git a/spec/models/panel_spec.rb b/spec/models/panel_spec.rb
index 4aa269c..17714c3 100644 (file)
--- a/spec/models/panel_spec.rb
+++ b/spec/models/panel_spec.rb
@@ -584,11 +584,11 @@ describe Panel do
     end\r
       it 'フキダシはフキダシ枠を含んでいる' do\r
         r = Panel.list_opt\r
-        r[:speech_balloons].has_key?(:balloons).should be_true\r
+        r[:speech_balloons].has_key?(:balloon).should be_true\r
       end\r
       it 'フキダシはセリフを含んでいる' do\r
         r = Panel.list_opt\r
-        r[:speech_balloons].has_key?(:speeches).should be_true\r
+        r[:speech_balloons].has_key?(:speech).should be_true\r
       end\r
     it '絵地を含んでいる' do\r
       r = Panel.list_opt\r
@@ -723,11 +723,11 @@ describe Panel do
     end\r
       it 'フキダシはフキダシ枠を含んでいる' do\r
         r = Panel.show_opt[:include]\r
-        r[:speech_balloons].has_key?(:balloons).should be_true\r
+        r[:speech_balloons].has_key?(:balloon).should be_true\r
       end\r
       it 'フキダシはセリフを含んでいる' do\r
         r = Panel.show_opt[:include]\r
-        r[:speech_balloons].has_key?(:speeches).should be_true\r
+        r[:speech_balloons].has_key?(:speech).should be_true\r
       end\r
     it '絵地を含んでいる' do\r
       r = Panel.show_opt[:include]\r
@@ -924,6 +924,12 @@ describe Panel do
       @sb = @panel.speech_balloons.create(\r
         FactoryGirl.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id, :t => 0)\r
       )\r
+      @sb.create_balloon(\r
+        FactoryGirl.attributes_for(:balloon, :speech_balloon_id => @sb.id)\r
+      )\r
+      @sb.create_speech(\r
+        FactoryGirl.attributes_for(:speech, :speech_balloon_id => @sb.id)\r
+      )\r
       @gc = @panel.ground_colors.create(\r
         FactoryGirl.attributes_for(:ground_color, :panel_id => @panel.id, :t => 2)\r
       )\r
@@ -952,8 +958,8 @@ describe Panel do
       #t:0\r
       sb = r['elements'].first\r
       sb.has_key?('classname').should be_true\r
-      sb.has_key?('balloons').should be_true\r
-      sb.has_key?('speeches').should be_true\r
+      sb.has_key?('balloon').should be_true\r
+      sb.has_key?('speech').should be_true\r
       #t:1\r
     end\r
   end\r
@@ -1099,19 +1105,19 @@ describe Panel do
         sb1 = @panel.speech_balloons.build(\r
           FactoryGirl.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id, :t => 2, :z => 2+1)\r
         )\r
-        sb1.balloons.build(\r
+        sb1.build_balloon(\r
           FactoryGirl.attributes_for(:balloon, :speech_balloon_id => sb1.id)\r
         )\r
-        sb1.speeches.build(\r
+        sb1.build_speech(\r
           FactoryGirl.attributes_for(:speech, :speech_balloon_id => sb1.id)\r
         )\r
         sb2 = @panel.speech_balloons.build(\r
           FactoryGirl.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id, :t => 3, :z => 3+1)\r
         )\r
-        sb2.balloons.build(\r
+        sb2.build_balloon(\r
           FactoryGirl.attributes_for(:balloon, :speech_balloon_id => sb2.id)\r
         )\r
-        sb2.speeches.build(\r
+        sb2.build_speech(\r
           FactoryGirl.attributes_for(:speech, :speech_balloon_id => sb2.id)\r
         )\r
         @gc = @panel.ground_colors.build(\r
@@ -1136,19 +1142,19 @@ describe Panel do
         sb1 = @panel.speech_balloons.build(\r
           FactoryGirl.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id, :t => 2, :z => 2+1)\r
         )\r
-        sb1.balloons.build(\r
+        sb1.build_balloon(\r
           FactoryGirl.attributes_for(:balloon, :speech_balloon_id => sb1.id)\r
         )\r
-        sb1.speeches.build(\r
+        sb1.build_speech(\r
           FactoryGirl.attributes_for(:speech, :speech_balloon_id => sb1.id)\r
         )\r
         sb2 = @panel.speech_balloons.build(\r
           FactoryGirl.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id, :t => 4, :z => 3+1)\r
         )\r
-        sb2.balloons.build(\r
+        sb2.build_balloon(\r
           FactoryGirl.attributes_for(:balloon, :speech_balloon_id => sb2.id)\r
         )\r
-        sb2.speeches.build(\r
+        sb2.build_speech(\r
           FactoryGirl.attributes_for(:speech, :speech_balloon_id => sb2.id)\r
         )\r
         @gc = @panel.ground_colors.build(\r
@@ -1173,19 +1179,19 @@ describe Panel do
         sb1 = @panel.speech_balloons.build(\r
           FactoryGirl.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id, :t => 2, :z => 2+1)\r
         )\r
-        sb1.balloons.build(\r
+        sb1.build_balloon(\r
           FactoryGirl.attributes_for(:balloon, :speech_balloon_id => sb1.id)\r
         )\r
-        sb1.speeches.build(\r
+        sb1.build_speech(\r
           FactoryGirl.attributes_for(:speech, :speech_balloon_id => sb1.id)\r
         )\r
         sb2 = @panel.speech_balloons.build(\r
           FactoryGirl.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id, :t => 3, :z => 3+1)\r
         )\r
-        sb2.balloons.build(\r
+        sb2.build_balloon(\r
           FactoryGirl.attributes_for(:balloon, :speech_balloon_id => sb2.id)\r
         )\r
-        sb2.speeches.build(\r
+        sb2.build_speech(\r
           FactoryGirl.attributes_for(:speech, :speech_balloon_id => sb2.id)\r
         )\r
         @gc = @panel.ground_colors.build(\r