add Picture

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

diff --git a/spec/models/resource_picture_spec.rb b/spec/models/resource_picture_spec.rb
index 28a3430..d1278a2 100644 (file)
--- a/spec/models/resource_picture_spec.rb
+++ b/spec/models/resource_picture_spec.rb
@@ -13,7 +13,7 @@ describe ResourcePicture do
     @sp = Factory :system_picture
     @lg = Factory :license_group
     @license = Factory :license, :license_group_id => @lg.id, :system_picture_id => @sp.id
-    @original_picture = Factory :original_picture, :artist_id => @artist.id, :license_id => @license.id\r
+    @original_picture = Factory :original_picture, :artist_id => @artist.id\r
     
     class Mgk ; class Image ; end ; end
     Mgk::Image.stub(:from_blob).with(any_args).and_return([Mgk.new])
@@ -212,7 +212,7 @@ describe ResourcePicture do
   \r
   describe '単体取得に於いて' do
     before do
-      @op = Factory :original_picture, :artist_id => @artist.id, :license_id => @license.id
+      @op = Factory :original_picture, :artist_id => @artist.id
       @rp = Factory :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => @op.id
     end
     it '指定の素材を返す' do
@@ -247,7 +247,7 @@ describe ResourcePicture do
   end
   describe '一覧取得に於いて' do
     before do
-      @op = Factory :original_picture, :artist_id => @artist.id, :license_id => @license.id
+      @op = Factory :original_picture, :artist_id => @artist.id
       @rp = Factory :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => @op.id
     end
     context 'page補正について' do
@@ -280,20 +280,20 @@ describe ResourcePicture do
       pic.should eq [@rp]
     end
     it '時系列で並んでいる' do
-      nop = Factory :original_picture, :artist_id => @artist.id, :license_id => @license.id
+      nop = Factory :original_picture, :artist_id => @artist.id
       nrp = Factory :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => nop.id, :updated_at => Time.now + 100
       pic = ResourcePicture.list
       pic.should eq [nrp, @rp]
     end
     context 'DBに5件あって1ページの件数を2件に変えたとして' do
       before do
-        nop2 = Factory :original_picture, :artist_id => @artist.id, :license_id => @license.id
+        nop2 = Factory :original_picture, :artist_id => @artist.id
         @nrp2 = Factory :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => nop2.id, :updated_at => Time.now + 100
-        nop3 = Factory :original_picture, :artist_id => @artist.id, :license_id => @license.id
+        nop3 = Factory :original_picture, :artist_id => @artist.id
         @nrp3 = Factory :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => nop3.id, :updated_at => Time.now + 200
-        nop4 = Factory :original_picture, :artist_id => @artist.id, :license_id => @license.id
+        nop4 = Factory :original_picture, :artist_id => @artist.id
         @nrp4 = Factory :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => nop4.id, :updated_at => Time.now + 300
-        nop5 = Factory :original_picture, :artist_id => @artist.id, :license_id => @license.id
+        nop5 = Factory :original_picture, :artist_id => @artist.id
         @nrp5 = Factory :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => nop5.id, :updated_at => Time.now + 400
         ResourcePicture.stub(:default_page_size).and_return(2)
       end
@@ -396,9 +396,9 @@ describe ResourcePicture do
   describe '対象素材の取得に於いて' do
     before do\r
       @op = Factory.build :original_picture, :ext => 'jpeg', :width => 264, :height => 265, :filesize => 266, \r
-        :artist_id => @artist.id, :license_id => @license.id
+        :artist_id => @artist.id
       @rp = Factory.build :resource_picture, \r
-        :artist_id => @artist.id, :license_id => @license.id
+        :artist_id => @artist.id
     end
     context '原画オブジェクトが素材を持っている(更新ケース)' do
       before do\r
@@ -432,7 +432,7 @@ describe ResourcePicture 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
       @rp = Factory.build :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => @op.id
     end
     context '事前チェック' do
@@ -576,7 +576,7 @@ describe ResourcePicture do
       ResourcePicture.any_instance.stub(:v).with(any_args).and_return('data')
       ResourcePicture.any_instance.stub(:vh).with(any_args).and_return('data')
       ResourcePicture.any_instance.stub(:thumbnail).with(any_args).and_return('data')
-      @op = Factory :original_picture, :artist_id => @artist.id, :license_id => @license.id
+      @op = Factory :original_picture, :artist_id => @artist.id
       @rp = Factory :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => @op.id
     end
     context '事前チェック' do