diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-30 10:03:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-30 10:03:31 +0000 |
| commit | 51c8d5b2f3517e37b5313fc7f57436c2f6da5e4b (patch) | |
| tree | 43fa4d49c2250d34496d2714cf47fe806e10f544 /spec | |
| parent | 47ed0a990bda27147b785615e0084f7999b39e12 (diff) | |
| parent | 233a9861113df678e1f54dfbd13d9ab23fd5d5a0 (diff) | |
| download | gitlab-ce-51c8d5b2f3517e37b5313fc7f57436c2f6da5e4b.tar.gz | |
Merge branch 'grape-router-helpers-bugfix' into 'master'
Fix grape-route-helper route shadowing
See merge request gitlab-org/gitlab-ce!16781
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/initializers/grape_route_helpers_fix_spec.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/spec/initializers/grape_route_helpers_fix_spec.rb b/spec/initializers/grape_route_helpers_fix_spec.rb new file mode 100644 index 00000000000..2cf5924128f --- /dev/null +++ b/spec/initializers/grape_route_helpers_fix_spec.rb @@ -0,0 +1,14 @@ +require 'spec_helper' +require_relative '../../config/initializers/grape_route_helpers_fix' + +describe 'route shadowing' do + include GrapeRouteHelpers::NamedRouteMatcher + + it 'does not occur' do + path = api_v4_projects_merge_requests_path(id: 1) + expect(path).to eq('/api/v4/projects/1/merge_requests') + + path = api_v4_projects_merge_requests_path(id: 1, merge_request_iid: 3) + expect(path).to eq('/api/v4/projects/1/merge_requests/3') + end +end |