merge v06sheet

[pettanr/pettanr.git] / spec / controllers / speech_balloon_templates_controller_spec.rb

diff --git a/spec/controllers/speech_balloon_templates_controller_spec.rb b/spec/controllers/speech_balloon_templates_controller_spec.rb
index 08eb32f..5173dff 100644 (file)
--- a/spec/controllers/speech_balloon_templates_controller_spec.rb
+++ b/spec/controllers/speech_balloon_templates_controller_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 describe SpeechBalloonTemplatesController do
 
   before do
+    SpeechBalloonTemplate.delete_all
     @admin = FactoryGirl.create :admin
     @sp = FactoryGirl.create :system_picture
     @lg = FactoryGirl.create :license_group
@@ -17,11 +18,11 @@ if MagicNumber['run_mode'] == 1
   describe '一覧表示に於いて' do
     before do
       sign_in @user
-      SpeechBalloonTemplate.stub(:list).and_return([@sbt, @sbt, @sbt])
+      SpeechBalloonTemplate.stub(:enable_list).and_return([@sbt, @sbt, @sbt])
     end
     context 'つつがなく終わるとき' do
       it 'フキダシテンプレートモデルに一覧を問い合わせている' do
-        SpeechBalloonTemplate.should_receive(:list).exactly(1)
+        SpeechBalloonTemplate.should_receive(:enable_list).exactly(1)
         get :index
       end
       it '@speech_balloon_templatesにリストを取得している' do