add OriginalPictureLicenseGroup

[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 f6029f2..5d0fec0 100644 (file)
--- a/spec/controllers/original_pictures_controller_spec.rb
+++ b/spec/controllers/original_pictures_controller_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+#原画
 require 'spec_helper'
 
 describe OriginalPicturesController do
@@ -14,7 +15,7 @@ describe OriginalPicturesController do
 
   describe '一覧表示に於いて' do
     before do
-      @op = Factory :original_picture, :artist_id => @artist.id , :license_id => @license.id
+      @op = Factory :original_picture, :artist_id => @artist.id
       sign_in @user
       OriginalPicture.stub(:list).and_return([@op, @op, @op])
     end
@@ -131,7 +132,7 @@ describe OriginalPicturesController do
   
   describe '単体表示に於いて' do
     before do
-      @pic = Factory :original_picture, :artist_id => @artist.id , :license_id => @license.id
+      @pic = Factory :original_picture, :artist_id => @artist.id
       sign_in @user
       OriginalPicture.stub(:show).and_return(@pic)
     end
@@ -394,7 +395,7 @@ describe OriginalPicturesController do
     context 'つつがなく終わるとき' do
       before do
         OriginalPicture.any_instance.stub(:store).with(any_args()).and_return {
-          assigns(:original_picture).attributes = Factory.attributes_for(:original_picture, :artist_id => @artist.id , :license_id => @license.id, :ext => 'jpeg')
+          assigns(:original_picture).attributes = Factory.attributes_for(:original_picture, :artist_id => @artist.id, :ext => 'jpeg')
           assigns(:original_picture).save
           true
         }
@@ -509,7 +510,7 @@ describe OriginalPicturesController do
 
   describe '編集フォーム表示に於いて' do
     before do
-      @pic = Factory :original_picture, :artist_id => @artist.id , :license_id => @license.id
+      @pic = Factory :original_picture, :artist_id => @artist.id
       sign_in @user
       OriginalPicture.stub(:show).and_return(@pic)
     end
@@ -593,7 +594,7 @@ describe OriginalPicturesController do
 
   describe '更新に於いて' do
     before do
-      @pic = Factory :original_picture, :artist_id => @artist.id , :license_id => @license.id
+      @pic = Factory :original_picture, :artist_id => @artist.id
       OriginalPicture.stub(:show).with(any_args()).and_return(@pic)
       sign_in @user
     end
@@ -617,7 +618,7 @@ describe OriginalPicturesController do
     context 'つつがなく終わるとき' do
       before do
         OriginalPicture.any_instance.stub(:store).with(any_args()).and_return {
-          assigns(:original_picture).attributes = Factory.attributes_for(:original_picture, :artist_id => @artist.id , :license_id => @license.id, :ext => 'jpeg')
+          assigns(:original_picture).attributes = Factory.attributes_for(:original_picture, :artist_id => @artist.id, :ext => 'jpeg')
           assigns(:original_picture).save
           true
         }