Commit 058c3483 authored by 🤖 GitLab Bot 🤖's avatar 🤖 GitLab Bot 🤖

Add latest changes from gitlab-org/[email protected]

parent 92482bb9
Pipeline #128564335 passed with stages
in 99 minutes and 42 seconds
---
title: Fix OpenAPI file detector
merge_request: 27321
author: Roger Meier
type: fixed
......@@ -40,7 +40,7 @@ module Gitlab
yarn_lock: 'yarn.lock',
# OpenAPI Specification files
openapi: %r{([^\/]+)*(openapi|swagger)([^\/]+)*\.(yaml|yml|json)\z}i
openapi: %r{.*(openapi|swagger).*\.(yaml|yml|json)\z}i
}.freeze
# Returns an Array of file types based on the given paths.
......
......@@ -96,25 +96,14 @@ describe Gitlab::FileDetector do
'swagger.yml', 'swagger.yaml', 'swagger.json',
'gitlab_swagger.yml', 'openapi_gitlab.yml',
'OpenAPI.YML', 'openapi.Yaml', 'openapi.JSON',
'openapi.gitlab.yml', 'gitlab.openapi.yml',
'attention/openapi.yml', 'attention/swagger.yml',
'attention/gitlab_swagger.yml', 'attention/openapi_gitlab.yml',
'openapi/openapi.yml', 'openapi/swagger.yml',
'openapi/my_openapi.yml', 'openapi/swagger_one.yml'
'openapi.gitlab.yml', 'gitlab.openapi.yml'
]
openapi_types.each do |type_name|
expect(described_class.type_of(type_name)).to eq(:openapi)
end
openapi_bad_types = [
'openapiyml',
'openapi/attention.yaml', 'swagger/attention.yaml'
]
openapi_bad_types.each do |type_name|
expect(described_class.type_of(type_name)).to be_nil
end
expect(described_class.type_of('openapiyml')).to be_nil
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment