ComputerSurge/shields
3
0
Fork 0
Code Pull Requests 1 Activity

User color should not override error color (#2693)

Browse Source 
Fix #1446.
This commit is contained in:
Paul Melnikow
2019-01-09 16:32:28 -05:00
committed by GitHub
parent e528c85ed4
commit cd0ff105f6
9 changed files with 82 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/dynamic/dynamic-json.tester.js
View File

@@ -129,14 +129,13 @@ t.create('JSON from url | error color overrides default')
colorB: colorsB.red,
})
// FIXME This is a regression which should be fixed in BaseService.
// t.create('JSON from url | error color overrides user specified')
// .get('.json?query=$.version&colorB=10ADED&style=_shields_test')
// .expectJSON({
// name: 'custom badge',
// value: 'invalid query parameter: url',
// colorB: colorsB.red,
// })
t.create('JSON from url | error color overrides user specified')
.get('.json?query=$.version&colorB=10ADED&style=_shields_test')
.expectJSON({
name: 'custom badge',
value: 'invalid query parameter: url',
colorB: colorsB.red,
})
let headers
t.create('JSON from url | request should set Accept header')

34
services/dynamic/dynamic-xml.tester.js
View File

@@ -131,25 +131,23 @@ t.create('XML from url | user color overrides default')
colorB: '#10ADED',
})
// bug: https://github.com/badges/shields/issues/1446
// t.create('XML from url | error color overrides default')
// .get(
// '.json?url=https://github.com/badges/shields/raw/master/notafile.xml&query=//version&style=_shields_test'
// )
// .expectJSON({
// name: 'custom badge',
// value: 'resource not found',
// colorB: colorsB.lightgrey,
// })
t.create('XML from url | error color overrides default')
.get(
'.json?url=https://github.com/badges/shields/raw/master/notafile.xml&query=//version&style=_shields_test'
)
.expectJSON({
name: 'custom badge',
value: 'resource not found',
colorB: colorsB.red,
})
// bug: https://github.com/badges/shields/issues/1446
// t.create('XML from url | error color overrides user specified')
// .get('.json?query=//version&colorB=10ADED&style=_shields_test')
// .expectJSON({
// name: 'custom badge',
// value: 'invalid query parameter: url',
// colorB: colorsB.red,
// })
t.create('XML from url | error color overrides user specified')
.get('.json?query=//version&colorB=10ADED&style=_shields_test')
.expectJSON({
name: 'custom badge',
value: 'invalid query parameter: url',
colorB: colorsB.red,
})
let headers
t.create('XML from url | request should set Accept header')

45
services/dynamic/dynamic-yaml.tester.js
View File

@@ -80,29 +80,26 @@ t.create('YAML from url | invalid url')
colorB: colorsB.red,
})
// bug: https://github.com/badges/shields/issues/1446
// t.create('YAML from url | user color overrides default')
// .get(
// '.json?url=https://raw.githubusercontent.com/kubernetes/charts/568291d6e476c39ca8322c30c3f601d0383d4760/stable/coredns/Chart.yaml&query=$.name&colorB=10ADED&style=_shields_test'
// )
// .expectJSON({ name: 'custom badge', value: 'coredns', colorB: '#10ADED' })
t.create('YAML from url | user color overrides default')
.get(
'.json?url=https://raw.githubusercontent.com/kubernetes/charts/568291d6e476c39ca8322c30c3f601d0383d4760/stable/coredns/Chart.yaml&query=$.name&colorB=10ADED&style=_shields_test'
)
.expectJSON({ name: 'custom badge', value: 'coredns', colorB: '#10ADED' })
// bug: https://github.com/badges/shields/issues/1446
// t.create('YAML from url | error color overrides default')
// .get(
// '.json?url=https://raw.githubusercontent.com/kubernetes/charts/568291d6e476c39ca8322c30c3f601d0383d4760/stable/coredns/notafile.yaml&query=$.version&style=_shields_test'
// )
// .expectJSON({
// name: 'custom badge',
// value: 'resource not found',
// colorB: colorsB.lightgrey,
// })
t.create('YAML from url | error color overrides default')
.get(
'.json?url=https://raw.githubusercontent.com/kubernetes/charts/568291d6e476c39ca8322c30c3f601d0383d4760/stable/coredns/notafile.yaml&query=$.version&style=_shields_test'
)
.expectJSON({
name: 'custom badge',
value: 'resource not found',
colorB: colorsB.red,
})
// bug: https://github.com/badges/shields/issues/1446
// t.create('YAML from url | error color overrides user specified')
// .get('.json?query=$.version&colorB=10ADED&style=_shields_test')
// .expectJSON({
// name: 'custom badge',
// value: 'invalid query parameter: url',
// colorB: colorsB.red,
// })
t.create('YAML from url | error color overrides user specified')
.get('.json?query=$.version&colorB=10ADED&style=_shields_test')
.expectJSON({
name: 'custom badge',
value: 'invalid query parameter: url',
colorB: colorsB.red,
})