diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-01-05 00:00:59 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-01-05 00:00:59 +0000 |
| commit | d432d674148601555c4ba693bb7c282ac9fe3d4a (patch) | |
| tree | 95ba550d24f9465bcf0beb0015ce6d692df299ca | |
| parent | 755f5112ec0054cdd9566c01f26440f1c1e984b8 (diff) | |
| parent | 1d2fe4d99c05c4c87b7a9a75e5d90535a8eddfbc (diff) | |
| download | gitlab-ce-d432d674148601555c4ba693bb7c282ac9fe3d4a.tar.gz | |
Merge branch 'mk/fix-broken-master-api-variables' into 'master'
Fix broken master api_variables test
See merge request gitlab-org/gitlab-ce!24165
| -rw-r--r-- | spec/models/project_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 72284035b57..65b59c7b21b 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -3534,7 +3534,9 @@ describe Project do end it 'contains a URL variable for every supported API version' do - supported_versions = API::API.versions.select do |version| + # Ensure future API versions have proper variables defined. We're not doing this for v3. + supported_versions = API::API.versions - ['v3'] + supported_versions = supported_versions.select do |version| API::API.routes.select { |route| route.version == version }.many? end |