diff options
author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-10-27 11:29:51 +0200 |
---|---|---|
committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-11-07 19:52:09 +0100 |
commit | 58d1d6a5c7e0a45c9aa8a9d4d1be24dbdce5a08a (patch) | |
tree | 4f78e39630276f4dc734964f44dc1d7869282955 /spec | |
parent | 5dde0536c323d14fef2327a8d553b5f8a8a7b2d0 (diff) | |
download | gitlab-ce-58d1d6a5c7e0a45c9aa8a9d4d1be24dbdce5a08a.tar.gz |
Free up some group reserved words
Diffstat (limited to 'spec')
-rw-r--r-- | spec/helpers/labels_helper_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/path_regex_spec.rb | 8 | ||||
-rw-r--r-- | spec/models/group_spec.rb | 6 | ||||
-rw-r--r-- | spec/routing/group_routing_spec.rb | 73 |
4 files changed, 61 insertions, 28 deletions
diff --git a/spec/helpers/labels_helper_spec.rb b/spec/helpers/labels_helper_spec.rb index 36d6e495ed0..4ac4302adfd 100644 --- a/spec/helpers/labels_helper_spec.rb +++ b/spec/helpers/labels_helper_spec.rb @@ -24,7 +24,7 @@ describe LabelsHelper do let(:group) { build(:group, name: 'bar') } it 'links to group issues page' do - expect(link_to_label(label, subject: group)).to match %r{<a href="/groups/bar/issues\?label_name%5B%5D=#{label.name}">.*</a>} + expect(link_to_label(label, subject: group)).to match %r{<a href="/groups/bar/-/issues\?label_name%5B%5D=#{label.name}">.*</a>} end end diff --git a/spec/lib/gitlab/path_regex_spec.rb b/spec/lib/gitlab/path_regex_spec.rb index c76084114cb..98fcc84c416 100644 --- a/spec/lib/gitlab/path_regex_spec.rb +++ b/spec/lib/gitlab/path_regex_spec.rb @@ -297,7 +297,7 @@ describe Gitlab::PathRegex do end it 'rejects group routes' do - expect(subject).not_to match('root/activity/') + expect(subject).not_to match('root/analytics/') end end @@ -317,7 +317,7 @@ describe Gitlab::PathRegex do end it 'rejects group routes' do - expect(subject).not_to match('root/activity/more/') + expect(subject).not_to match('root/analytics/more/') end end end @@ -350,7 +350,7 @@ describe Gitlab::PathRegex do end it 'accepts group routes' do - expect(subject).to match('activity/') + expect(subject).to match('analytics/') end it 'is not case sensitive' do @@ -381,7 +381,7 @@ describe Gitlab::PathRegex do end it 'accepts group routes' do - expect(subject).to match('root/activity/') + expect(subject).to match('root/analytics/') end it 'is not case sensitive' do diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index c8caa11b8b0..d4052a64570 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -65,12 +65,6 @@ describe Group do expect(group).not_to be_valid end - - it 'rejects reserved group paths' do - group = build(:group, path: 'activity', parent: create(:group)) - - expect(group).not_to be_valid - end end describe '#visibility_level_allowed_by_parent' do diff --git a/spec/routing/group_routing_spec.rb b/spec/routing/group_routing_spec.rb index b3e55f5e3c9..3e56d34bc9d 100644 --- a/spec/routing/group_routing_spec.rb +++ b/spec/routing/group_routing_spec.rb @@ -18,37 +18,36 @@ describe "Groups", "routing" do end it "to #activity" do - expect(get("/groups/#{group_path}/activity")).to route_to('groups#activity', id: group_path) + expect(get("/groups/#{group_path}/-/activity")).to route_to('groups#activity', id: group_path) end it "to #issues" do - expect(get("/groups/#{group_path}/issues")).to route_to('groups#issues', id: group_path) + expect(get("/groups/#{group_path}/-/issues")).to route_to('groups#issues', id: group_path) end it "to #members" do expect(get("/groups/#{group_path}/-/group_members")).to route_to('groups/group_members#index', group_id: group_path) end - describe 'legacy redirection' do - shared_examples 'canonical groups route' do |path| - it "#{path} routes to the correct controller" do - expect(get("/groups/#{group_path}/-/#{path}")) - .to route_to(group_id: group_path, - controller: "groups/#{path}", - action: 'index') - end + it "to #labels" do + expect(get("/groups/#{group_path}/-/labels")).to route_to('groups/labels#index', group_id: group_path) + end - it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/#{path}", "/groups/complex.group-namegit/-/#{path}/" do - let(:resource) { create(:group, parent: group, path: path) } - end - end + it "to #milestones" 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 'canonical groups route', 'labels' + 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 end describe 'group_members' do - it_behaves_like 'canonical groups route', 'group_members' + 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 @@ -61,7 +60,9 @@ describe "Groups", "routing" do end describe 'milestones' do - it_behaves_like 'canonical groups route', 'milestones' + 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 @@ -74,5 +75,43 @@ describe "Groups", "routing" do 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 end end |