diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-06 09:10:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-06 09:10:18 +0300 |
| commit | 5947e68ac310a25614438df36149b27b0654eb5c (patch) | |
| tree | 05d34230936ffcd2e4fecbf2c1b76b15e6ffaa00 /spec/controllers | |
| parent | 091f92820381bde259de3d33571ee5102d54cb01 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/admin/topics_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/admin/topics_controller_spec.rb b/spec/controllers/admin/topics_controller_spec.rb index 87093e0263b..111fdcc3be6 100644 --- a/spec/controllers/admin/topics_controller_spec.rb +++ b/spec/controllers/admin/topics_controller_spec.rb @@ -194,7 +194,7 @@ RSpec.describe Admin::TopicsController do end it 'renders a 400 error for identical topic ids' do - post :merge, params: { source_topic_id: topic, target_topic_id: topic.id } + post :merge, params: { source_topic_id: topic.id, target_topic_id: topic.id } expect(response).to have_gitlab_http_status(:bad_request) expect { topic.reload }.not_to raise_error |