diff options
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/members_spec.rb | 24 | ||||
| -rw-r--r-- | spec/requests/projects/issue_links_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/requests/projects/work_items_spec.rb | 2 | ||||
| -rw-r--r-- | spec/requests/users_controller_spec.rb | 2 |
4 files changed, 27 insertions, 3 deletions
diff --git a/spec/requests/api/members_spec.rb b/spec/requests/api/members_spec.rb index 4eff5e96e9c..85ccfa3cf51 100644 --- a/spec/requests/api/members_spec.rb +++ b/spec/requests/api/members_spec.rb @@ -739,6 +739,30 @@ RSpec.describe API::Members, feature_category: :subgroups do end.to change { source.members.count }.by(-1) end + it_behaves_like 'rate limited endpoint', rate_limit_key: :member_delete do + let(:current_user) { maintainer } + + let(:another_member) { create(:user) } + + before do + source.add_developer(another_member) + end + + # We rate limit scoped by the group / project + let(:delete_paths) do + [ + api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", maintainer), + api("/#{source_type.pluralize}/#{source.id}/members/#{another_member.id}", maintainer) + ] + end + + def request + delete_member_path = delete_paths.shift + + delete delete_member_path + end + end + it_behaves_like '412 response' do let(:request) { api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", maintainer) } end diff --git a/spec/requests/projects/issue_links_controller_spec.rb b/spec/requests/projects/issue_links_controller_spec.rb index 5678a81a4b0..2f91d42660f 100644 --- a/spec/requests/projects/issue_links_controller_spec.rb +++ b/spec/requests/projects/issue_links_controller_spec.rb @@ -33,7 +33,7 @@ RSpec.describe Projects::IssueLinksController, feature_category: :team_planning expect(json_response.count).to eq(1) expect(json_response.first).to include( - 'path' => project_work_items_path(issue_b.project, issue_b.iid, iid_path: true), + 'path' => project_work_items_path(issue_b.project, issue_b.iid), 'type' => 'TASK' ) end diff --git a/spec/requests/projects/work_items_spec.rb b/spec/requests/projects/work_items_spec.rb index 99337771960..c02f76d2c65 100644 --- a/spec/requests/projects/work_items_spec.rb +++ b/spec/requests/projects/work_items_spec.rb @@ -41,7 +41,7 @@ RSpec.describe 'Work Items', feature_category: :team_planning do end it 'renders index' do - get project_work_items_url(work_item.project, work_items_path: work_item.id) + get project_work_items_url(work_item.project, work_items_path: work_item.iid) expect(response).to have_gitlab_http_status(:ok) end diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb index 75ae0c970c0..14e4fea0548 100644 --- a/spec/requests/users_controller_spec.rb +++ b/spec/requests/users_controller_spec.rb @@ -528,7 +528,7 @@ RSpec.describe UsersController, feature_category: :user_management do get user_calendar_activities_url public_user.username - expect(response.body).to include(project_work_items_path(project, work_item.iid, iid_path: true)) + expect(response.body).to include(project_work_items_path(project, work_item.iid)) expect(response.body).to include(project_issue_path(project, issue)) end |