Remove deprecated group routes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
34b8231d49
commit
9259ab7dec
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Remove deprecated group routes
|
||||
merge_request: 29351
|
||||
author:
|
||||
type: removed
|
|
@ -88,12 +88,4 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
|
|||
put '/', action: :update
|
||||
delete '/', action: :destroy
|
||||
end
|
||||
|
||||
# Legacy paths should be defined last, so they would be ignored if routes with
|
||||
# one of the previously reserved words exist.
|
||||
scope(path: 'groups/*group_id') do
|
||||
Gitlab::Routing.redirect_legacy_paths(self, :labels, :milestones, :group_members,
|
||||
:edit, :issues, :merge_requests, :projects,
|
||||
:activity)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -41,111 +41,16 @@ describe "Groups", "routing" do
|
|||
expect(get("/groups/#{group_path}/-/milestones")).to route_to('groups/milestones#index', group_id: group_path)
|
||||
end
|
||||
|
||||
describe 'legacy redirection' do
|
||||
describe 'labels' do
|
||||
it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/labels", "/groups/complex.group-namegit/-/labels" do
|
||||
let(:resource) { create(:group, parent: group, path: 'labels') }
|
||||
end
|
||||
|
||||
context 'when requesting JSON' do
|
||||
it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/labels.json", "/groups/complex.group-namegit/-/labels.json" do
|
||||
let(:resource) { create(:group, parent: group, path: 'labels') }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'group_members' do
|
||||
it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/group_members", "/groups/complex.group-namegit/-/group_members" do
|
||||
let(:resource) { create(:group, parent: group, path: 'group_members') }
|
||||
end
|
||||
end
|
||||
|
||||
describe 'avatar' do
|
||||
it 'routes to the avatars controller' do
|
||||
expect(delete("/groups/#{group_path}/-/avatar"))
|
||||
.to route_to(group_id: group_path,
|
||||
controller: 'groups/avatars',
|
||||
action: 'destroy')
|
||||
end
|
||||
end
|
||||
|
||||
describe 'milestones' do
|
||||
it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/milestones", "/groups/complex.group-namegit/-/milestones" do
|
||||
let(:resource) { create(:group, parent: group, path: 'milestones') }
|
||||
end
|
||||
|
||||
context 'nested routes' do
|
||||
include RSpec::Rails::RequestExampleGroup
|
||||
|
||||
let(:milestone) { create(:milestone, group: group) }
|
||||
|
||||
it 'redirects the nested routes' do
|
||||
request = get("/groups/#{group_path}/milestones/#{milestone.id}/merge_requests")
|
||||
expect(request).to redirect_to("/groups/#{group_path}/-/milestones/#{milestone.id}/merge_requests")
|
||||
end
|
||||
end
|
||||
|
||||
context 'with a query string' do
|
||||
it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/milestones?hello=world", "/groups/complex.group-namegit/-/milestones?hello=world" do
|
||||
let(:resource) { create(:group, parent: group, path: 'milestones') }
|
||||
end
|
||||
|
||||
it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/milestones?milestones=/milestones", "/groups/complex.group-namegit/-/milestones?milestones=/milestones" do
|
||||
let(:resource) { create(:group, parent: group, path: 'milestones') }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'edit' do
|
||||
it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/edit", "/groups/complex.group-namegit/-/edit" do
|
||||
let(:resource) do
|
||||
pending('still rejected because of the wildcard reserved word')
|
||||
create(:group, parent: group, path: 'edit')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'issues' do
|
||||
it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/issues", "/groups/complex.group-namegit/-/issues" do
|
||||
let(:resource) { create(:group, parent: group, path: 'issues') }
|
||||
end
|
||||
end
|
||||
|
||||
describe 'merge_requests' do
|
||||
it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/merge_requests", "/groups/complex.group-namegit/-/merge_requests" do
|
||||
let(:resource) { create(:group, parent: group, path: 'merge_requests') }
|
||||
end
|
||||
end
|
||||
|
||||
describe 'projects' do
|
||||
it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/projects", "/groups/complex.group-namegit/-/projects" do
|
||||
let(:resource) { create(:group, parent: group, path: 'projects') }
|
||||
end
|
||||
end
|
||||
|
||||
describe 'activity' do
|
||||
it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/activity", "/groups/complex.group-namegit/-/activity" do
|
||||
let(:resource) { create(:group, parent: group, path: 'activity') }
|
||||
end
|
||||
|
||||
it_behaves_like 'redirecting a legacy path', "/groups/activity/activity", "/groups/activity/-/activity" do
|
||||
let!(:parent) { create(:group, path: 'activity') }
|
||||
let(:resource) { create(:group, parent: parent, path: 'activity') }
|
||||
end
|
||||
end
|
||||
|
||||
describe 'subgroup "boards"' do
|
||||
it 'shows group show page' do
|
||||
allow(Group).to receive(:find_by_full_path).with('gitlabhq/boards', any_args).and_return(true)
|
||||
|
||||
expect(get('/groups/gitlabhq/boards')).to route_to('groups#show', id: 'gitlabhq/boards')
|
||||
end
|
||||
|
||||
it 'shows boards index page' do
|
||||
it 'routes to the boards controller' do
|
||||
allow(Group).to receive(:find_by_full_path).with('gitlabhq', any_args).and_return(true)
|
||||
|
||||
expect(get('/groups/gitlabhq/-/boards')).to route_to('groups/boards#index', group_id: 'gitlabhq')
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue