From 140ac8d2ad81f03f67dddcb565458e9baee79755 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Wed, 23 Aug 2017 21:51:21 +0800 Subject: Add changelog and tests --- spec/models/project_spec.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'spec/models/project_spec.rb') diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 2e613c44357..130c0739033 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -1563,10 +1563,18 @@ describe Project do describe 'project import state transitions' do context 'state transition: [:started] => [:finished]' do - let(:housekeeping_service) { spy } + let(:cleanup_service) { spy(:cleanup_service) } + let(:housekeeping_service) { spy(:housekeeping_service) } before do - allow(Projects::HousekeepingService).to receive(:new) { housekeeping_service } + allow(Projects::ImportExport::CleanupService) + .to receive(:new) { cleanup_service } + + allow(cleanup_service) + .to receive(:execute) { housekeeping_service.execute } + + allow(Projects::HousekeepingService) + .to receive(:new) { housekeeping_service } end it 'resets project import_error' do @@ -1581,6 +1589,7 @@ describe Project do project.import_finish + expect(cleanup_service).to have_received(:execute) expect(housekeeping_service).to have_received(:execute) end -- cgit v1.2.1 From 932d32515a72bc80e021474100f677d954f3822e Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 24 Aug 2017 18:58:31 +0800 Subject: Move to Projects::HousecleaningService --- spec/models/project_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'spec/models/project_spec.rb') diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 130c0739033..7631207b1d0 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -1563,14 +1563,14 @@ describe Project do describe 'project import state transitions' do context 'state transition: [:started] => [:finished]' do - let(:cleanup_service) { spy(:cleanup_service) } + let(:housecleaning_service) { spy(:housecleaning_service) } let(:housekeeping_service) { spy(:housekeeping_service) } before do - allow(Projects::ImportExport::CleanupService) - .to receive(:new) { cleanup_service } + allow(Projects::HousecleaningService) + .to receive(:new) { housecleaning_service } - allow(cleanup_service) + allow(housecleaning_service) .to receive(:execute) { housekeeping_service.execute } allow(Projects::HousekeepingService) @@ -1589,7 +1589,7 @@ describe Project do project.import_finish - expect(cleanup_service).to have_received(:execute) + expect(housecleaning_service).to have_received(:execute) expect(housekeeping_service).to have_received(:execute) end -- cgit v1.2.1 From 3a4da8ce8b57aa430720de75397a38c2be0fc6c0 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Mon, 28 Aug 2017 18:51:23 +0800 Subject: Fix tests --- spec/models/project_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'spec/models/project_spec.rb') diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 7631207b1d0..11717ba39e8 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -1563,14 +1563,14 @@ describe Project do describe 'project import state transitions' do context 'state transition: [:started] => [:finished]' do - let(:housecleaning_service) { spy(:housecleaning_service) } + let(:after_import_service) { spy(:after_import_service) } let(:housekeeping_service) { spy(:housekeeping_service) } before do - allow(Projects::HousecleaningService) - .to receive(:new) { housecleaning_service } + allow(Projects::AfterImportService) + .to receive(:new) { after_import_service } - allow(housecleaning_service) + allow(after_import_service) .to receive(:execute) { housekeeping_service.execute } allow(Projects::HousekeepingService) @@ -1589,7 +1589,7 @@ describe Project do project.import_finish - expect(housecleaning_service).to have_received(:execute) + expect(after_import_service).to have_received(:execute) expect(housekeeping_service).to have_received(:execute) end -- cgit v1.2.1