merge v06sheet

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

diff --git a/spec/models/balloon_spec.rb b/spec/models/balloon_spec.rb
index cf82f80..a7f8a34 100644 (file)
--- a/spec/models/balloon_spec.rb
+++ b/spec/models/balloon_spec.rb
@@ -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,6 +15,7 @@ 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
+    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