diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-08 12:13:55 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-08 12:13:55 +0000 |
| commit | 571b02efc9442e73538c3438eb593a83d7807779 (patch) | |
| tree | 96c4ecbdaa066fac502111a3192cc396d6f4a79a /spec/controllers/projects/merge_requests_controller_spec.rb | |
| parent | efe3186770a4218333e1a720f1e4d3794892673e (diff) | |
| download | gitlab-ce-571b02efc9442e73538c3438eb593a83d7807779.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index fd77d07705d..f78d50bba24 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -851,7 +851,7 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review it "deletes the merge request" do delete :destroy, params: { namespace_id: project.namespace, project_id: project, id: merge_request.iid, destroy_confirm: true } - expect(response).to have_gitlab_http_status(:found) + expect(response).to have_gitlab_http_status(:see_other) expect(controller).to set_flash[:notice].to(/The merge request was successfully deleted\./) end |