diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/controllers/projects/service_hook_logs_controller_spec.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/controllers/projects/service_hook_logs_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/service_hook_logs_controller_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/controllers/projects/service_hook_logs_controller_spec.rb b/spec/controllers/projects/service_hook_logs_controller_spec.rb index 97fb31f0546..040e59fc822 100644 --- a/spec/controllers/projects/service_hook_logs_controller_spec.rb +++ b/spec/controllers/projects/service_hook_logs_controller_spec.rb @@ -5,13 +5,13 @@ require 'spec_helper' RSpec.describe Projects::ServiceHookLogsController do let(:project) { create(:project, :repository) } let(:user) { create(:user) } - let(:service) { create(:drone_ci_service, project: project) } - let(:log) { create(:web_hook_log, web_hook: service.service_hook) } + let(:integration) { create(:drone_ci_integration, project: project) } + let(:log) { create(:web_hook_log, web_hook: integration.service_hook) } let(:log_params) do { namespace_id: project.namespace, project_id: project, - service_id: service.to_param, + service_id: integration.to_param, id: log.id } end @@ -35,7 +35,7 @@ RSpec.describe Projects::ServiceHookLogsController do it 'executes the hook and redirects to the service form' do expect_any_instance_of(ServiceHook).to receive(:execute) expect_any_instance_of(described_class).to receive(:set_hook_execution_notice) - expect(subject).to redirect_to(edit_project_service_path(project, service)) + expect(subject).to redirect_to(edit_project_service_path(project, integration)) end end end |