test update

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

diff --git a/spec/models/original_picture_spec.rb b/spec/models/original_picture_spec.rb
index 8366b4d..f61ef84 100644 (file)
--- a/spec/models/original_picture_spec.rb
+++ b/spec/models/original_picture_spec.rb
@@ -193,23 +193,43 @@ describe OriginalPicture do
     before do
       @op = Factory :original_picture, :artist_id => @artist.id
     end
-    it '指定のコミックを返す' do
-      pic = OriginalPicture.show @op.id, @author
+    it '指定の原画を返す' do
+      pic = OriginalPicture.show @op.id, @artist
       pic.should eq @op
     end
     context '関連テーブルオプションがないとき' do
-      it 'ã\83©ã\82¤ã\82»ã\83³ã\82¹ã\83\87ã\83¼ã\82¿ã\81 ã\81\91を含んでいる' do
+      it 'ã\83©ã\82¤ã\82»ã\83³ã\82¹ã\81¨ç´ æ\9d\90を含んでいる' do
         r = OriginalPicture.show_include_opt
-        r.should eq [:license]
+        r.should eq [:license, :resource_picture]
       end
     end
     context '関連テーブルオプションで絵師を含ませたとき' do
-      it 'ã\83©ã\82¤ã\82»ã\83³ã\82¹ã\83\87ã\83¼ã\82¿と作者データを含んでいる' do
+      it 'ã\83©ã\82¤ã\82»ã\83³ã\82¹ã\81¨ç´ æ\9d\90と作者データを含んでいる' do
         r = OriginalPicture.show_include_opt(:include => :artist)
-        r.should eq [:license, :artist]
+        r.should eq [:license, :resource_picture, :artist]
+      end
+    end
+    context '他人の原画を開こうとしたとき' do
+      it '403Forbidden例外を返す' do
+        lambda{
+          pic = OriginalPicture.show @op.id, @other_artist
+        }.should raise_error(ActiveRecord::Forbidden)
+      end
+    end
+    context '存在しない原画を開こうとしたとき' do
+      it '404RecordNotFound例外を返す' do
+        lambda{
+          pic = OriginalPicture.show 0, @artist
+        }.should raise_error(ActiveRecord::RecordNotFound)
       end
     end
   end
+  describe 'json単体出力オプションに於いて' do
+    it 'includeキーがライセンスと素材を含んでいる' do
+      r = OriginalPicture.show_json_include_opt
+      r[:include].should eq [:license, :resource_picture]
+    end
+  end
   describe '一覧取得に於いて' do
     before do
       @op = Factory :original_picture, :artist_id => @artist.id
@@ -280,6 +300,12 @@ describe OriginalPicture do
       end
     end
   end
+  describe 'json一覧出力オプションに於いて' do
+    it 'includeキーがライセンスと素材を含んでいる' do
+      r = OriginalPicture.list_json_opt
+      r[:include].should eq [:license, :resource_picture]
+    end
+  end
   describe 'RMagick変換に於いて' do
     before do
       @op = Factory.build :original_picture, :artist_id => @artist.id