Commit d6b978d0 authored by Rémy Coutable's avatar Rémy Coutable Committed by Robert Speicher

Fix fixture paths for EE specs

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 2edf07ef
...@@ -46,3 +46,16 @@ Gitlab/ModuleWithInstanceVariables: ...@@ -46,3 +46,16 @@ Gitlab/ModuleWithInstanceVariables:
# We ignore spec helpers because it usually doesn't matter # We ignore spec helpers because it usually doesn't matter
- spec/support/**/*.rb - spec/support/**/*.rb
- features/steps/**/*.rb - features/steps/**/*.rb
GitlabSecurity/PublicSend:
Enabled: true
Exclude:
- 'config/**/*'
- 'db/**/*'
- 'ee/db/**/*'
- 'features/**/*'
- 'lib/**/*.rake'
- 'ee/lib/**/*.rake'
- 'qa/**/*'
- 'spec/**/*'
- 'ee/spec/**/*'
{ {
"type": "object", "type": "object",
"allOf": [ "allOf": [
{ "$ref": "../../../../../../fixtures/api/schemas/public_api/v4/board.json" }, { "$ref": "../../../../../../../spec/fixtures/api/schemas/public_api/v4/board.json" },
{ {
"required" : [ "required" : [
"name", "name",
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
}, },
"issue": { "issue": {
"allOf": [ "allOf": [
{ "$ref": "../../../../../../fixtures/api/schemas/public_api/v4/issue.json" }, { "$ref": "../../../../../../../spec/fixtures/api/schemas/public_api/v4/issue.json" },
{ {
"properties": { "properties": {
"weight": { "type": ["integer", "null"] } "weight": { "type": ["integer", "null"] }
......
{ {
"allOf": [ "allOf": [
{ "$ref": "../../../../../../fixtures/api/schemas/public_api/v4/issues.json" }, { "$ref": "../../../../../../../spec/fixtures/api/schemas/public_api/v4/issues.json" },
{ {
"properties": { "properties": {
"weight": { "type": ["integer", "null"] } "weight": { "type": ["integer", "null"] }
......
module SchemaPath module SchemaPath
def self.expand(schema, dir = '') def self.expand(schema, dir = '')
Rails.root.join('spec', dir, "fixtures/api/schemas/#{schema}.json").to_s Rails.root.join(dir, 'spec', "fixtures/api/schemas/#{schema}.json").to_s
end 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