merge v04

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

diff --git a/spec/models/panel_picture_spec.rb b/spec/models/panel_picture_spec.rb
index 1520382..8842c55 100644 (file)
--- a/spec/models/panel_picture_spec.rb
+++ b/spec/models/panel_picture_spec.rb
@@ -7,9 +7,12 @@ describe PanelPicture do
     @user = Factory( :user_yas)
     @author = @user.author
     @artist = Factory :artist_yas, :author_id => @author.id
-    @license = Factory :license
-    @op = Factory :original_picture, :artist_id => @artist.id, :license_id => @license.id
-    @rp = Factory :resource_picture, :artist_id => @artist.id, :license_id => @license.id, :original_picture_id => @op.id
+    @sp = Factory :system_picture
+    @lg = Factory :license_group
+    @license = Factory :license, :license_group_id => @lg.id, :system_picture_id => @sp.id
+    @op = Factory :original_picture, :artist_id => @artist.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
     @panel = Factory :panel, :author_id => @author.id
   end
   
@@ -26,6 +29,7 @@ describe PanelPicture do
       before do
         @pp = Factory.build :panel_picture, :panel_id => @panel.id, :resource_picture_id => @rp.id
       end
+      #ネストの保存はnilを許可しなければならないので数値チェックだけ
       it 'テストデータの確認' do
         @pp.panel_id = @panel.id
         @pp.should be_valid
@@ -35,27 +39,6 @@ describe PanelPicture do
         @pp.should_not be_valid
       end
     end
-    context 'resource_picture_idを検証するとき' do
-      before do
-        @pp = Factory.build :panel_picture, :panel_id => @panel.id, :resource_picture_id => @rp.id
-      end
-      it 'テストデータの確認' do
-        @pp.resource_picture_id = @rp.id
-        @pp.should be_valid
-      end
-      it 'nullなら失敗する' do
-        @pp.resource_picture_id = nil
-        @pp.should_not be_valid
-      end
-      it '数値でなければ失敗する' do
-        @pp.resource_picture_id = 'a'
-        @pp.should_not be_valid
-      end
-      it '存在するフキダシテンプレートでなければ失敗する' do
-        @pp.resource_picture_id = 0
-        @pp.should_not be_valid
-      end
-    end
     context 'linkを検証するとき' do
       before do
         @pp = Factory.build :panel_picture, :panel_id => @panel.id, :resource_picture_id => @rp.id