diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-04-18 04:36:06 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-18 04:36:06 +0300 |
| commit | 60196e8bcce1b74d5dee8021f3c69aa8e0aff717 (patch) | |
| tree | 06ea562cbec9a1816da3dddf6b2f0b6a5a46d95e /spec | |
| parent | 40ab0e9168382ea446be721aac22c901fa983e3e (diff) | |
| parent | 00c4e1410388b6d85e3f163204a49c31f76b5349 (diff) | |
Merge branch 'dm-no-format-suffix' into 'master'
Remove format from end of URL for URLs that take a ref or path
See merge request !10740
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/routing/project_routing_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb index 4baccacd448..a3de022d242 100644 --- a/spec/routing/project_routing_spec.rb +++ b/spec/routing/project_routing_spec.rb @@ -484,7 +484,7 @@ describe 'project routing' do end it 'to #list' do - expect(get('/gitlab/gitlabhq/files/master.json')).to route_to('projects/find_file#list', namespace_id: 'gitlab', project_id: 'gitlabhq', id: 'master', format: 'json') + expect(get('/gitlab/gitlabhq/files/master.json')).to route_to('projects/find_file#list', namespace_id: 'gitlab', project_id: 'gitlabhq', id: 'master.json') end end |