diff options
Diffstat (limited to 'spec/services/branches')
5 files changed, 15 insertions, 5 deletions
diff --git a/spec/services/branches/create_service_spec.rb b/spec/services/branches/create_service_spec.rb index 072a86d17fc..b682a3f26ec 100644 --- a/spec/services/branches/create_service_spec.rb +++ b/spec/services/branches/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Branches::CreateService do +RSpec.describe Branches::CreateService do subject(:service) { described_class.new(project, user) } let_it_be(:project) { create(:project_empty_repo) } diff --git a/spec/services/branches/delete_merged_service_spec.rb b/spec/services/branches/delete_merged_service_spec.rb index 5c87f156ec7..2cf0f53c8c3 100644 --- a/spec/services/branches/delete_merged_service_spec.rb +++ b/spec/services/branches/delete_merged_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Branches::DeleteMergedService do +RSpec.describe Branches::DeleteMergedService do include ProjectForksHelper subject(:service) { described_class.new(project, project.owner) } diff --git a/spec/services/branches/delete_service_spec.rb b/spec/services/branches/delete_service_spec.rb index 2219416d94d..f1e7c9340b1 100644 --- a/spec/services/branches/delete_service_spec.rb +++ b/spec/services/branches/delete_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Branches::DeleteService do +RSpec.describe Branches::DeleteService do let(:project) { create(:project, :repository) } let(:repository) { project.repository } let(:user) { create(:user) } @@ -10,6 +10,10 @@ describe Branches::DeleteService do subject(:service) { described_class.new(project, user) } shared_examples 'a deleted branch' do |branch_name| + before do + allow(Ci::RefDeleteUnlockArtifactsWorker).to receive(:perform_async) + end + it 'removes the branch' do expect(branch_exists?(branch_name)).to be true @@ -18,6 +22,12 @@ describe Branches::DeleteService do expect(result.status).to eq :success expect(branch_exists?(branch_name)).to be false end + + it 'calls the RefDeleteUnlockArtifactsWorker' do + expect(Ci::RefDeleteUnlockArtifactsWorker).to receive(:perform_async).with(project.id, user.id, "refs/heads/#{branch_name}") + + service.execute(branch_name) + end end describe '#execute' do diff --git a/spec/services/branches/diverging_commit_counts_service_spec.rb b/spec/services/branches/diverging_commit_counts_service_spec.rb index 370da773ab2..34a2b81c831 100644 --- a/spec/services/branches/diverging_commit_counts_service_spec.rb +++ b/spec/services/branches/diverging_commit_counts_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Branches::DivergingCommitCountsService do +RSpec.describe Branches::DivergingCommitCountsService do let(:project) { create(:project, :repository) } let(:repository) { project.repository } diff --git a/spec/services/branches/validate_new_service_spec.rb b/spec/services/branches/validate_new_service_spec.rb index 6d5078d3ccb..02127c8c10d 100644 --- a/spec/services/branches/validate_new_service_spec.rb +++ b/spec/services/branches/validate_new_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Branches::ValidateNewService do +RSpec.describe Branches::ValidateNewService do let(:project) { create(:project, :repository) } subject(:service) { described_class.new(project) } |