t#31078:add ImportResult

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

diff --git a/spec/models/provider_original_picture_spec.rb b/spec/models/provider_original_picture_spec.rb
index dc4adf7..7d3ca0d 100644 (file)
--- a/spec/models/provider_original_picture_spec.rb
+++ b/spec/models/provider_original_picture_spec.rb
@@ -882,11 +882,10 @@ describe ProviderOriginalPicture do
         ProviderOriginalPicture.stub(:import_pictures).with(any_args).and_return([])
         ProviderOriginalPicture.stub(:import_resource_pictures).with(any_args).and_return([])
       end
-      it '各失敗したカラム値をHashで返す' do
+      it 'ImportResultを返す' do
         r = ProviderOriginalPicture.import @provider.id, [@opattr], [@pattr]
-        r[:original_pictures].should be_empty
-        r[:pictures].should be_empty
-        r[:resource_pictures].should be_empty
+        r.is_a?(ImportResult).should be_true
+        r.should be_success
       end
     end
     #警告ケース
@@ -896,11 +895,11 @@ describe ProviderOriginalPicture do
         ProviderOriginalPicture.stub(:import_pictures).with(any_args).and_return([])
         ProviderOriginalPicture.stub(:import_resource_pictures).with(any_args).and_return([])
       end
-      it '失敗した原画のカラム値を配列でoriginal_picturesに追加している' do
+      it '結果が失敗している' do
         r = ProviderOriginalPicture.import @provider.id, [@opattr], [@pattr]
-        r[:original_pictures].should_not be_empty
-        r[:pictures].should be_empty
-        r[:resource_pictures].should be_empty
+        r.should_not be_success
+        r.is_a?(OriginalPictureImportResult).should be_true
+        r.failures.should_not be_empty
       end
     end
     context '実素材インポートに失敗したとき' do
@@ -909,11 +908,11 @@ describe ProviderOriginalPicture do
         ProviderOriginalPicture.stub(:import_pictures).with(any_args).and_return([@pattr])
         ProviderOriginalPicture.stub(:import_resource_pictures).with(any_args).and_return([])
       end
-      it '失敗した原画のカラム値を配列でpicturesに追加している' do
+      it '結果が失敗している' do
         r = ProviderOriginalPicture.import @provider.id, [@opattr], [@pattr]
-        r[:original_pictures].should be_empty
-        r[:pictures].should_not be_empty
-        r[:resource_pictures].should be_empty
+        r.should_not be_success
+        r.is_a?(PictureImportResult).should be_true
+        r.failures.should_not be_empty
       end
     end
     context '素材インポートに失敗したとき' do
@@ -922,11 +921,11 @@ describe ProviderOriginalPicture do
         ProviderOriginalPicture.stub(:import_pictures).with(any_args).and_return([])
         ProviderOriginalPicture.stub(:import_resource_pictures).with(any_args).and_return([@rpattr])
       end
-      it '失敗した原画のカラム値を配列でresource_picturesに追加している' do
+      it '結果が失敗している' do
         r = ProviderOriginalPicture.import @provider.id, [@opattr], [@pattr]
-        r[:original_pictures].should be_empty
-        r[:pictures].should be_empty
-        r[:resource_pictures].should_not be_empty
+        r.should_not be_success
+        r.is_a?(ResourcePictureImportResult).should be_true
+        r.failures.should_not be_empty
       end
     end
   end