diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-02-03 23:44:35 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-02-03 23:44:35 +0800 |
commit | 1868b8af25a6ecf3e893782b3ff750da57dc07c3 (patch) | |
tree | 127932b24bc82574779a658a85c2ae1a01010e14 /spec | |
parent | aaf382d52b87ba13f0cf904e076d9e3eac8d77d9 (diff) | |
download | gitlab-ce-1868b8af25a6ecf3e893782b3ff750da57dc07c3.tar.gz |
Move the tests to spec/services/projects/destroy_service_spec.rb
Diffstat (limited to 'spec')
-rw-r--r-- | spec/services/projects/destroy_service_spec.rb | 3 | ||||
-rw-r--r-- | spec/workers/project_destroy_worker_spec.rb | 23 |
2 files changed, 10 insertions, 16 deletions
diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb index 90771825f5c..38bd2ed773e 100644 --- a/spec/services/projects/destroy_service_spec.rb +++ b/spec/services/projects/destroy_service_spec.rb @@ -47,8 +47,9 @@ describe Projects::DestroyService, services: true do it_behaves_like 'deleting the project' end - context 'delete with pipeline' do # which has optimistic locking + context 'delete with pipeline and build' do # which has optimistic locking let!(:pipeline) { create(:ci_pipeline, project: project) } + let!(:build) { create(:ci_build, :artifacts, pipeline: pipeline) } before do expect(project).to receive(:destroy!).and_call_original diff --git a/spec/workers/project_destroy_worker_spec.rb b/spec/workers/project_destroy_worker_spec.rb index 4b1a342930c..1f4c39eb64a 100644 --- a/spec/workers/project_destroy_worker_spec.rb +++ b/spec/workers/project_destroy_worker_spec.rb @@ -1,28 +1,21 @@ require 'spec_helper' describe ProjectDestroyWorker do - let(:project) { create(:project, pending_delete: true) } + let(:project) { create(:project) } let(:path) { project.repository.path_to_repo } subject { ProjectDestroyWorker.new } - describe '#perform' do - context 'with pipelines and builds' do - let!(:pipeline) { create(:ci_pipeline, project: project) } - let!(:build) { create(:ci_build, :artifacts, pipeline: pipeline) } + describe "#perform" do + it "deletes the project" do + subject.perform(project.id, project.owner.id, {}) - it 'deletes the project along with pipelines and builds' do - subject.perform(project.id, project.owner.id, {}) - - expect(Project.all).not_to include(project) - expect(Ci::Pipeline.all).not_to include(pipeline) - expect(Ci::Build.all).not_to include(build) - expect(Dir.exist?(path)).to be_falsey - end + expect(Project.all).not_to include(project) + expect(Dir.exist?(path)).to be_falsey end - it 'deletes the project but skips repo deletion' do - subject.perform(project.id, project.owner.id, { 'skip_repo' => true }) + it "deletes the project but skips repo deletion" do + subject.perform(project.id, project.owner.id, { "skip_repo" => true }) expect(Project.all).not_to include(project) expect(Dir.exist?(path)).to be_truthy |