t#29620:json output include child

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

diff --git a/spec/models/artist_spec.rb b/spec/models/artist_spec.rb
index 815edbc..3bfff22 100644 (file)
--- a/spec/models/artist_spec.rb
+++ b/spec/models/artist_spec.rb
@@ -185,51 +185,24 @@ describe Artist do
       r = Artist.list_opt
       r.has_key?(:include).should be_true
     end
-    it '4つの項目を含んでいる' do
+    it '1つの項目を含んでいる' do
       r = Artist.list_opt[:include]
-      r.should have(4).items
+      r.should have(1).items
     end
     it '作家を含んでいる' do
       r = Artist.list_opt[:include]
       r.has_key?(:author).should be_true
     end
-    it '原画を含んでいる' do
-      r = Artist.list_opt[:include]
-      r.has_key?(:original_pictures).should be_true
-    end
-    it '実素材を含んでいる' do
-      r = Artist.list_opt[:include]
-      r.has_key?(:pictures).should be_true
-    end
-    it '素材を含んでいる' do
-      r = Artist.list_opt[:include]
-      r.has_key?(:resource_pictures).should be_true
-    end
   end
   describe 'json一覧出力オプションに於いて' do
-    it 'includeキーを含んでいる' do
-      r = Artist.list_json_opt
-      r.has_key?(:include).should be_true
-    end
-    it '4つの項目を含んでいる' do
-      r = Artist.list_json_opt[:include]
-      r.should have(4).items
+    before do
+      @artist = FactoryGirl.create :artist, :author_id => @author.id
     end
     it '作家を含んでいる' do
-      r = Artist.list_json_opt[:include]
-      r.has_key?(:author).should be_true
-    end
-    it '原画を含んでいる' do
-      r = Artist.list_json_opt[:include]
-      r.has_key?(:original_pictures).should be_true
-    end
-    it '実素材を含んでいる' do
-      r = Artist.list_json_opt[:include]
-      r.has_key?(:pictures).should be_true
-    end
-    it '素材を含んでいる' do
-      r = Artist.list_json_opt[:include]
-      r.has_key?(:resource_pictures).should be_true
+      r = Artist.list.to_json Artist.list_json_opt
+      j = JSON.parse r
+      i = j.first
+      i.has_key?('author').should be_true
     end
   end
   
@@ -311,51 +284,20 @@ describe Artist do
       r = Artist.show_opt
       r.has_key?(:include).should be_true
     end
-    it '4つの項目を含んでいる' do
-      r = Artist.show_opt[:include]
-      r.should have(4).items
-    end
-    it '作家を含んでいる' do
+    it '1つの項目を含んでいる' do
       r = Artist.show_opt[:include]
-      r.has_key?(:author).should be_true
-    end
-    it '原画を含んでいる' do
-      r = Artist.show_opt[:include]
-      r.has_key?(:original_pictures).should be_true
-    end
-    it '実素材を含んでいる' do
-      r = Artist.show_opt[:include]
-      r.has_key?(:pictures).should be_true
-    end
-    it '素材を含んでいる' do
-      r = Artist.show_opt[:include]
-      r.has_key?(:resource_pictures).should be_true
+      r.should have(1).items
     end
   end
   describe 'json単体出力オプションに於いて' do
-    it 'includeキーを含んでいる' do
-      r = Artist.show_json_opt
-      r.has_key?(:include).should be_true
-    end
-    it '4つの項目を含んでいる' do
-      r = Artist.show_json_opt[:include]
-      r.should have(4).items
+    before do
+      @artist = FactoryGirl.create :artist, :author_id => @author.id
     end
     it '作家を含んでいる' do
-      r = Artist.show_json_opt[:include]
-      r.has_key?(:author).should be_true
-    end
-    it '原画を含んでいる' do
-      r = Artist.show_json_opt[:include]
-      r.has_key?(:original_pictures).should be_true
-    end
-    it '実素材を含んでいる' do
-      r = Artist.show_json_opt[:include]
-      r.has_key?(:pictures).should be_true
-    end
-    it '素材を含んでいる' do
-      r = Artist.show_json_opt[:include]
-      r.has_key?(:resource_pictures).should be_true
+      r = Artist.show(@artist.id, @author).to_json Artist.show_json_opt
+      j = JSON.parse r
+      i = j
+      i.has_key?('author').should be_true
     end
   end
 end