summaryrefslogtreecommitdiff
path: root/spec/routing
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-23 21:06:29 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-23 21:06:29 +0000
commitb9254657872c4db441ab268154686f5476fb4bc6 (patch)
treeab045c623296a049d1246ba2d66800456a1077aa /spec/routing
parentc792263edfaf826c58f4aa41d26904464a17a3e7 (diff)
downloadgitlab-ce-b9254657872c4db441ab268154686f5476fb4bc6.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/routing')
-rw-r--r--spec/routing/project_routing_spec.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index 7e2d70d6eb5..acdbf064a73 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -276,6 +276,11 @@ describe 'project routing' do
expect(get('/gitlab/gitlabhq/refs/feature%2B45/logs_tree/foo/bar/baz')).to route_to('projects/refs#logs_tree', namespace_id: 'gitlab', project_id: 'gitlabhq', id: 'feature+45', path: 'foo/bar/baz')
expect(get('/gitlab/gitlabhq/refs/feature@45/logs_tree/foo/bar/baz')).to route_to('projects/refs#logs_tree', namespace_id: 'gitlab', project_id: 'gitlabhq', id: 'feature@45', path: 'foo/bar/baz')
expect(get('/gitlab/gitlabhq/refs/stable/logs_tree/files.scss')).to route_to('projects/refs#logs_tree', namespace_id: 'gitlab', project_id: 'gitlabhq', id: 'stable', path: 'files.scss')
+ assert_routing({ path: "/gitlab/gitlabhq/refs/stable/logs_tree/new%0A%0Aline.txt",
+ method: :get },
+ { controller: 'projects/refs', action: 'logs_tree',
+ namespace_id: 'gitlab', project_id: 'gitlabhq',
+ id: "stable", path: "new\n\nline.txt" })
end
end