Merge branch 'v05' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v05

[pettanr/pettanr.git] / spec / controllers / provider_statuses_controller_spec.rb

diff --git a/spec/controllers/provider_statuses_controller_spec.rb b/spec/controllers/provider_statuses_controller_spec.rb
index 7f3fa43..3af7034 100644 (file)
--- a/spec/controllers/provider_statuses_controller_spec.rb
+++ b/spec/controllers/provider_statuses_controller_spec.rb
@@ -369,7 +369,7 @@ describe ProviderStatusesController do
     context '事前チェックしておく' do
       before do
         ProviderStatus.any_instance.stub(:status).with(any_args).and_return(1)
-        ProviderStatus.stub(:licenses_import).with(any_args).and_return([])
+        ProviderStatus.stub(:licenses_import).with(any_args).and_return(LicenseImportResult.new([]))
       end
       it '借受状況モデルに単体取得を問い合わせている' do
         ProviderStatus.should_receive(:show).exactly(1)
@@ -383,7 +383,7 @@ describe ProviderStatusesController do
     context 'つつがなく終わるとき' do
       before do
         ProviderStatus.any_instance.stub(:status).with(any_args).and_return(1)
-        ProviderStatus.any_instance.stub(:licenses_import).with(any_args).and_return([])
+        ProviderStatus.any_instance.stub(:licenses_import).with(any_args).and_return(LicenseImportResult.new([]))
       end
       it 'ステータスコード200 OKを返す' do
         get :licenses_import, :id => @ps.id
@@ -393,9 +393,9 @@ describe ProviderStatusesController do
         get :licenses_import, :id => @ps.id
         assigns(:provider_status).should eq(@ps)
       end
-      it '@failuresにインポート失敗リストを取得している' do
+      it '@import_resultにインポート結果を取得している' do
         get :licenses_import, :id => @ps.id
-        assigns(:failures).should eq([])
+        assigns(:import_result).is_a?(ImportResult).should be_true
       end
       context 'html形式' do
         it 'licenses_importテンプレートを描画する' do
@@ -466,7 +466,7 @@ describe ProviderStatusesController do
     context '事前チェックしておく' do
       before do
         ProviderStatus.any_instance.stub(:status).with(any_args).and_return(1)
-        ProviderStatus.any_instance.stub(:artists_import).with(any_args).and_return([])
+        ProviderStatus.any_instance.stub(:artists_import).with(any_args).and_return(ArtistImportResult.new([]))
       end
       it '借受状況モデルに単体取得を問い合わせている' do
         ProviderStatus.should_receive(:show).exactly(1)
@@ -480,7 +480,7 @@ describe ProviderStatusesController do
     context 'つつがなく終わるとき' do
       before do
         ProviderStatus.any_instance.stub(:status).with(any_args).and_return(1)
-        ProviderStatus.any_instance.stub(:artists_import).with(any_args).and_return([])
+        ProviderStatus.any_instance.stub(:artists_import).with(any_args).and_return(ArtistImportResult.new([]))
       end
       it 'ステータスコード200 OKを返す' do
         get :artists_import, :id => @ps.id
@@ -490,9 +490,9 @@ describe ProviderStatusesController do
         get :artists_import, :id => @ps.id
         assigns(:provider_status).should eq(@ps)
       end
-      it '@failuresにインポート失敗リストを取得している' do
+      it '@import_resultにインポート結果を取得している' do
         get :artists_import, :id => @ps.id
-        assigns(:failures).should eq([])
+        assigns(:import_result).is_a?(ImportResult).should be_true
       end
       context 'html形式' do
         it 'artists_importテンプレートを描画する' do
@@ -572,7 +572,7 @@ describe ProviderStatusesController do
     context '事前チェックしておく' do
       before do
         ProviderStatus.any_instance.stub(:status).with(any_args).and_return(1)
-        ProviderStatus.any_instance.stub(:original_pictures_import).with(any_args).and_return({:original_pictures => [], :pictures => [], :resource_pictures => []})
+        ProviderStatus.any_instance.stub(:original_pictures_import).with(any_args).and_return(OriginalPictureImportResult.new([]))
       end
       it '借受状況モデルに単体取得を問い合わせている' do
         ProviderStatus.should_receive(:show).exactly(1)
@@ -586,7 +586,7 @@ describe ProviderStatusesController do
     context 'つつがなく終わるとき' do
       before do
         ProviderStatus.any_instance.stub(:status).with(any_args).and_return(1)
-        ProviderStatus.any_instance.stub(:original_pictures_import).with(any_args).and_return({:original_pictures => [], :pictures => [], :resource_pictures => []})
+        ProviderStatus.any_instance.stub(:original_pictures_import).with(any_args).and_return(OriginalPictureImportResult.new([]))
       end
       it 'ステータスコード200 OKを返す' do
         get :original_pictures_import, :id => @ps.id
@@ -596,12 +596,9 @@ describe ProviderStatusesController do
         get :original_pictures_import, :id => @ps.id
         assigns(:provider_status).should eq(@ps)
       end
-      it '@failuresにインポート失敗リストを取得している' do
+      it '@import_resultにインポート結果を取得している' do
         get :original_pictures_import, :id => @ps.id
-        assigns(:failures).should_not be_nil
-        assigns(:failures)[:original_pictures].should be_empty
-        assigns(:failures)[:pictures].should be_empty
-        assigns(:failures)[:resource_pictures].should be_empty
+        assigns(:import_result).is_a?(ImportResult).should be_true
       end
       context 'html形式' do
         it 'artists_importテンプレートを描画する' do