diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 13:49:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 13:49:51 +0000 |
commit | 71786ddc8e28fbd3cb3fcc4b3ff15e5962a1c82e (patch) | |
tree | 6a2d93ef3fb2d353bb7739e4b57e6541f51cdd71 /spec/services/issues/close_service_spec.rb | |
parent | a7253423e3403b8c08f8a161e5937e1488f5f407 (diff) | |
download | gitlab-ce-71786ddc8e28fbd3cb3fcc4b3ff15e5962a1c82e.tar.gz |
Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42
Diffstat (limited to 'spec/services/issues/close_service_spec.rb')
-rw-r--r-- | spec/services/issues/close_service_spec.rb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/spec/services/issues/close_service_spec.rb b/spec/services/issues/close_service_spec.rb index ef24d1e940e..803808e667c 100644 --- a/spec/services/issues/close_service_spec.rb +++ b/spec/services/issues/close_service_spec.rb @@ -20,13 +20,13 @@ RSpec.describe Issues::CloseService do end describe '#execute' do - let(:service) { described_class.new(project: project, current_user: user) } + let(:service) { described_class.new(container: project, current_user: user) } context 'when skip_authorization is true' do it 'does close the issue even if user is not authorized' do non_authorized_user = create(:user) - service = described_class.new(project: project, current_user: non_authorized_user) + service = described_class.new(container: project, current_user: non_authorized_user) expect do service.execute(issue, skip_authorization: true) @@ -167,7 +167,7 @@ RSpec.describe Issues::CloseService do project.reload expect(project.external_issue_tracker).to receive(:close_issue) - described_class.new(project: project, current_user: user).close_issue(external_issue) + described_class.new(container: project, current_user: user).close_issue(external_issue) end end @@ -178,7 +178,7 @@ RSpec.describe Issues::CloseService do project.reload expect(project.external_issue_tracker).not_to receive(:close_issue) - described_class.new(project: project, current_user: user).close_issue(external_issue) + described_class.new(container: project, current_user: user).close_issue(external_issue) end end @@ -189,7 +189,7 @@ RSpec.describe Issues::CloseService do project.reload expect(project.external_issue_tracker).not_to receive(:close_issue) - described_class.new(project: project, current_user: user).close_issue(external_issue) + described_class.new(container: project, current_user: user).close_issue(external_issue) end end end @@ -197,7 +197,7 @@ RSpec.describe Issues::CloseService do context "closed by a merge request", :sidekiq_might_not_need_inline do subject(:close_issue) do perform_enqueued_jobs do - described_class.new(project: project, current_user: user).close_issue(issue, closed_via: closing_merge_request) + described_class.new(container: project, current_user: user).close_issue(issue, closed_via: closing_merge_request) end end @@ -266,7 +266,7 @@ RSpec.describe Issues::CloseService do context "closed by a commit", :sidekiq_might_not_need_inline do it 'mentions closure via a commit' do perform_enqueued_jobs do - described_class.new(project: project, current_user: user).close_issue(issue, closed_via: closing_commit) + described_class.new(container: project, current_user: user).close_issue(issue, closed_via: closing_commit) end email = ActionMailer::Base.deliveries.last @@ -280,7 +280,7 @@ RSpec.describe Issues::CloseService do it 'does not mention the commit id' do project.project_feature.update_attribute(:repository_access_level, ProjectFeature::DISABLED) perform_enqueued_jobs do - described_class.new(project: project, current_user: user).close_issue(issue, closed_via: closing_commit) + described_class.new(container: project, current_user: user).close_issue(issue, closed_via: closing_commit) end email = ActionMailer::Base.deliveries.last @@ -296,7 +296,7 @@ RSpec.describe Issues::CloseService do context "valid params" do subject(:close_issue) do perform_enqueued_jobs do - described_class.new(project: project, current_user: user).close_issue(issue) + described_class.new(container: project, current_user: user).close_issue(issue) end end @@ -438,7 +438,7 @@ RSpec.describe Issues::CloseService do expect(project).to receive(:execute_hooks).with(expected_payload, :issue_hooks) expect(project).to receive(:execute_integrations).with(expected_payload, :issue_hooks) - described_class.new(project: project, current_user: user).close_issue(issue) + described_class.new(container: project, current_user: user).close_issue(issue) end end @@ -449,7 +449,7 @@ RSpec.describe Issues::CloseService do expect(project).to receive(:execute_hooks).with(an_instance_of(Hash), :confidential_issue_hooks) expect(project).to receive(:execute_integrations).with(an_instance_of(Hash), :confidential_issue_hooks) - described_class.new(project: project, current_user: user).close_issue(issue) + described_class.new(container: project, current_user: user).close_issue(issue) end end |