merge v04

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

diff --git a/spec/controllers/original_pictures_controller_spec.rb b/spec/controllers/original_pictures_controller_spec.rb
index 5d0fec0..d020400 100644 (file)
--- a/spec/controllers/original_pictures_controller_spec.rb
+++ b/spec/controllers/original_pictures_controller_spec.rb
@@ -595,7 +595,7 @@ describe OriginalPicturesController do
   describe '更新に於いて' do
     before do
       @pic = Factory :original_picture, :artist_id => @artist.id
-      OriginalPicture.stub(:show).with(any_args()).and_return(@pic)
+      OriginalPicture.stub(:edit).with(any_args()).and_return(@pic)
       sign_in @user
     end
     context '事前チェックしておく' do
@@ -603,7 +603,7 @@ describe OriginalPicturesController do
         OriginalPicture.any_instance.stub(:store).with(any_args()).and_return(true)
       end
       it '原画モデルに単体取得を問い合わせている' do
-        OriginalPicture.should_receive(:show).exactly(1)\r
+        OriginalPicture.should_receive(:edit).exactly(1)\r
         put :update, :id => @pic.id, :original_picture => Factory.attributes_for(:original_picture)
       end
       it 'モデルに更新を依頼する' do