From a3dfd311f4660fc81e929058abd6e136ac884ed3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 14 Apr 2021 15:09:04 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/services/award_emojis/add_service_spec.rb | 1 + spec/services/award_emojis/destroy_service_spec.rb | 1 + spec/services/award_emojis/toggle_service_spec.rb | 1 + spec/services/environments/auto_stop_service_spec.rb | 2 ++ .../environments/canary_ingress/update_service_spec.rb | 1 + spec/services/environments/reset_auto_stop_service_spec.rb | 1 + spec/services/milestones/destroy_service_spec.rb | 14 ++++++++------ 7 files changed, 15 insertions(+), 6 deletions(-) (limited to 'spec/services') diff --git a/spec/services/award_emojis/add_service_spec.rb b/spec/services/award_emojis/add_service_spec.rb index 85c39015614..0fbb785e2d6 100644 --- a/spec/services/award_emojis/add_service_spec.rb +++ b/spec/services/award_emojis/add_service_spec.rb @@ -6,6 +6,7 @@ RSpec.describe AwardEmojis::AddService do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project) } let_it_be(:awardable) { create(:note, project: project) } + let(:name) { 'thumbsup' } subject(:service) { described_class.new(awardable, name, user) } diff --git a/spec/services/award_emojis/destroy_service_spec.rb b/spec/services/award_emojis/destroy_service_spec.rb index 2aba078b638..f743de7c59e 100644 --- a/spec/services/award_emojis/destroy_service_spec.rb +++ b/spec/services/award_emojis/destroy_service_spec.rb @@ -6,6 +6,7 @@ RSpec.describe AwardEmojis::DestroyService do let_it_be(:user) { create(:user) } let_it_be(:awardable) { create(:note) } let_it_be(:project) { awardable.project } + let(:name) { 'thumbsup' } let!(:award_from_other_user) do create(:award_emoji, name: name, awardable: awardable, user: create(:user)) diff --git a/spec/services/award_emojis/toggle_service_spec.rb b/spec/services/award_emojis/toggle_service_spec.rb index a7feeed50c6..74e97c66193 100644 --- a/spec/services/award_emojis/toggle_service_spec.rb +++ b/spec/services/award_emojis/toggle_service_spec.rb @@ -6,6 +6,7 @@ RSpec.describe AwardEmojis::ToggleService do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project, :public) } let_it_be(:awardable) { create(:note, project: project) } + let(:name) { 'thumbsup' } subject(:service) { described_class.new(awardable, name, user) } diff --git a/spec/services/environments/auto_stop_service_spec.rb b/spec/services/environments/auto_stop_service_spec.rb index 8e56c7e642c..93b1596586f 100644 --- a/spec/services/environments/auto_stop_service_spec.rb +++ b/spec/services/environments/auto_stop_service_spec.rb @@ -8,6 +8,7 @@ RSpec.describe Environments::AutoStopService, :clean_gitlab_redis_shared_state d let_it_be(:project) { create(:project, :repository) } let_it_be(:user) { create(:user) } + let(:service) { described_class.new } before_all do @@ -19,6 +20,7 @@ RSpec.describe Environments::AutoStopService, :clean_gitlab_redis_shared_state d let_it_be(:project) { create(:project, :repository) } let_it_be(:user) { create(:user) } + let(:environments) { Environment.all } before_all do diff --git a/spec/services/environments/canary_ingress/update_service_spec.rb b/spec/services/environments/canary_ingress/update_service_spec.rb index 5ba62e7104c..0e72fff1ed2 100644 --- a/spec/services/environments/canary_ingress/update_service_spec.rb +++ b/spec/services/environments/canary_ingress/update_service_spec.rb @@ -8,6 +8,7 @@ RSpec.describe Environments::CanaryIngress::UpdateService, :clean_gitlab_redis_c let_it_be(:project, refind: true) { create(:project) } let_it_be(:maintainer) { create(:user) } let_it_be(:reporter) { create(:user) } + let(:user) { maintainer } let(:params) { {} } let(:service) { described_class.new(project, user, params) } diff --git a/spec/services/environments/reset_auto_stop_service_spec.rb b/spec/services/environments/reset_auto_stop_service_spec.rb index cab1bf2cc26..4a0b091c12d 100644 --- a/spec/services/environments/reset_auto_stop_service_spec.rb +++ b/spec/services/environments/reset_auto_stop_service_spec.rb @@ -6,6 +6,7 @@ RSpec.describe Environments::ResetAutoStopService do let_it_be(:project) { create(:project) } let_it_be(:developer) { create(:user).tap { |user| project.add_developer(user) } } let_it_be(:reporter) { create(:user).tap { |user| project.add_reporter(user) } } + let(:user) { developer } let(:service) { described_class.new(project, user) } diff --git a/spec/services/milestones/destroy_service_spec.rb b/spec/services/milestones/destroy_service_spec.rb index dd68471d927..6c08b7db43a 100644 --- a/spec/services/milestones/destroy_service_spec.rb +++ b/spec/services/milestones/destroy_service_spec.rb @@ -22,14 +22,16 @@ RSpec.describe Milestones::DestroyService do expect { milestone.reload }.to raise_error ActiveRecord::RecordNotFound end - it 'deletes milestone id from issuables' do - issue = create(:issue, project: project, milestone: milestone) - merge_request = create(:merge_request, source_project: project, milestone: milestone) + context 'with an existing merge request' do + let!(:issue) { create(:issue, project: project, milestone: milestone) } + let!(:merge_request) { create(:merge_request, source_project: project, milestone: milestone) } - service.execute(milestone) + it 'deletes milestone id from issuables' do + service.execute(milestone) - expect(issue.reload.milestone).to be_nil - expect(merge_request.reload.milestone).to be_nil + expect(issue.reload.milestone).to be_nil + expect(merge_request.reload.milestone).to be_nil + end end it 'logs destroy event' do -- cgit v1.2.3