pass test:resource picture create

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

diff --git a/spec/controllers/resource_pictures_controller_spec.rb b/spec/controllers/resource_pictures_controller_spec.rb
index 26927d6..f5f7547 100644 (file)
--- a/spec/controllers/resource_pictures_controller_spec.rb
+++ b/spec/controllers/resource_pictures_controller_spec.rb
@@ -16,7 +16,8 @@ describe ResourcePicturesController do
 
   describe '一覧表示に於いて' do
     before do
-      @rp = Factory :resource_picture, :artist_id => @artist.id , :license_id => @license.id, :original_picture_id => @op.id
+      @p = Factory :picture, :original_picture_id => @op.id, :license_id => @license.id, :artist_id => @artist.id
+      @rp = Factory :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => @op.id, :picture_id => @p.id
       sign_in @user
       ResourcePicture.stub(:list).and_return([@rp, @rp, @rp])
     end
@@ -111,7 +112,8 @@ describe ResourcePicturesController do
   
   describe '単体表示に於いて' do
     before do
-      @pic = Factory :resource_picture, :artist_id => @artist.id , :license_id => @license.id, :original_picture_id => @op.id
+      @p = Factory :picture, :original_picture_id => @op.id, :license_id => @license.id, :artist_id => @artist.id
+      @pic = Factory :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => @op.id, :picture_id => @p.id
       sign_in @user
       ResourcePicture.stub(:show).and_return(@pic)
     end