badges/shields
1
0
Fork 0
mirror of https://github.com/badges/shields.git synced 2025-04-18 19:44:04 +03:00
Code

chore(deps-dev): bump prettier from 2.8.8 to 3.0.0 (#9357)

Browse Source 
* chore(deps-dev): bump prettier from 2.8.8 to 3.0.0

Bumps [prettier](https://github.com/prettier/prettier) from 2.8.8 to 3.0.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.8.8...3.0.0)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* reformat all the things (prettier 3)

* update tests to await calls to prettier.format()

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: chris48s <git@chris-shaw.dev>
This commit is contained in:
dependabot[bot] 2023-07-10 09:27:51 +00:00 committed by GitHub
parent fb794ec479
commit b9d96755ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
502 changed files with 2046 additions and 2032 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/actions/close-bot/helpers.js vendored
View File

@ -28,7 +28,7 @@ function allChangelogLinesAreVersionBump(changelogLines) {
changelogLines.length > 0 &&
changelogLines.length ===
changelogLines.filter(line =>
line.includes('Version bump only for package')
line.includes('Version bump only for package'),
).length
)
}
@ -52,14 +52,15 @@ function isPointlessVersionBump(body) {
.filter(line => !line.startsWith('<h'))
.filter(line => !line.startsWith('<p>All notable changes'))
.filter(
line => !line.startsWith('See <a href="https://conventionalcommits.org">')
line =>
!line.startsWith('See <a href="https://conventionalcommits.org">'),
)
.filter(line => !line.startsWith('<!--'))
.filter(
line =>
!line.startsWith(
'<p><a href="https://www.gatsbyjs.com/docs/reference/release-notes/'
)
'<p><a href="https://www.gatsbyjs.com/docs/reference/release-notes/',
),
)
return allChangelogLinesAreVersionBump(changelogLines)
}

2
badge-maker/CHANGELOG.md
View File

@ -275,7 +275,7 @@ badge.loadFont('/path/to/Verdana.ttf', err => {
{ text: ['build', 'passed'], colorscheme: 'green', template: 'flat' },
(svg, err) => {
// svg is a string containing your badge
}
},
)
})
```

8
badge-maker/index.test-d.ts
View File

@ -7,19 +7,19 @@ expectError(
makeBadge({
message: 'passed',
style: 'invalid style',
})
}),
)
expectType<string>(
makeBadge({
message: 'passed',
})
}),
)
expectType<string>(
makeBadge({
label: 'build',
message: 'passed',
})
}),
)
expectType<string>(
makeBadge({
@ -28,7 +28,7 @@ expectType<string>(
labelColor: 'green',
color: 'red',
style: 'flat',
})
}),
)
const error = new ValidationError()

12
badge-maker/lib/badge-renderers.js
View File

@ -69,7 +69,7 @@ function getLogoElement({ logo, horizPadding, badgeHeight, logoWidth }) {
function renderBadge(
{ links, leftWidth, rightWidth, height, accessibleText },
content
content,
) {
const width = leftWidth + rightWidth
const leftLink = links[0]
@ -397,7 +397,7 @@ class Plastic extends Badge {
accessibleText: this.accessibleText,
height: this.constructor.height,
},
[gradient, clipPath, backgroundGroup, this.foregroundGroupElement]
[gradient, clipPath, backgroundGroup, this.foregroundGroupElement],
)
}
}
@ -446,7 +446,7 @@ class Flat extends Badge {
accessibleText: this.accessibleText,
height: this.constructor.height,
},
[gradient, clipPath, backgroundGroup, this.foregroundGroupElement]
[gradient, clipPath, backgroundGroup, this.foregroundGroupElement],
)
}
}
@ -478,7 +478,7 @@ class FlatSquare extends Badge {
accessibleText: this.accessibleText,
height: this.constructor.height,
},
[backgroundGroup, this.foregroundGroupElement]
[backgroundGroup, this.foregroundGroupElement],
)
}
}
@ -748,7 +748,7 @@ function social({
accessibleText,
height: externalHeight,
},
[style, gradients, backgroundGroup, logoElement, foregroundGroup]
[style, gradients, backgroundGroup, logoElement, foregroundGroup],
)
}
@ -978,7 +978,7 @@ function forTheBadge({
accessibleText: createAccessibleText({ label, message }),
height: BADGE_HEIGHT,
},
[backgroundGroup, foregroundGroup]
[backgroundGroup, foregroundGroup],
)
}

2
badge-maker/lib/color.spec.js
View File

@ -75,7 +75,7 @@ test(toSvgColor, () => {
given('papayawhip').expect('papayawhip')
given('purple').expect('purple')
forCases([given(''), given(undefined), given('not-a-color')]).expect(
undefined
undefined,
)
given('lightgray').expect('#9f9f9f')
given('informational').expect('#007ec6')

4
badge-maker/lib/index.js
View File

@ -32,7 +32,7 @@ function _validate(format) {
]
if ('style' in format && !styleValues.includes(format.style)) {
throw new ValidationError(
`Field \`style\` must be one of (${styleValues.toString()})`
`Field \`style\` must be one of (${styleValues.toString()})`,
)
}
}
@ -46,7 +46,7 @@ function _clean(format) {
cleaned[key] = format[key]
} else {
throw new ValidationError(
`Unexpected field '${key}'. Allowed values are (${expectedKeys.toString()})`
`Unexpected field '${key}'. Allowed values are (${expectedKeys.toString()})`,
)
}
})

28
badge-maker/lib/index.spec.js
View File

@ -10,12 +10,12 @@ describe('makeBadge function', function () {
makeBadge({
label: 'build',
message: 'passed',
})
}),
).to.satisfy(isSvg)
expect(
makeBadge({
message: 'passed',
})
}),
).to.satisfy(isSvg)
expect(
makeBadge({
@ -23,7 +23,7 @@ describe('makeBadge function', function () {
message: 'passed',
color: 'green',
style: 'flat',
})
}),
).to.satisfy(isSvg)
})
@ -32,44 +32,44 @@ describe('makeBadge function', function () {
console.log(x)
expect(() => makeBadge(x)).to.throw(
ValidationError,
'makeBadge takes an argument of type object'
'makeBadge takes an argument of type object',
)
})
expect(() => makeBadge({})).to.throw(
ValidationError,
'Field `message` is required'
'Field `message` is required',
)
expect(() => makeBadge({ label: 'build' })).to.throw(
ValidationError,
'Field `message` is required'
'Field `message` is required',
)
expect(() =>
makeBadge({ label: 'build', message: 'passed', labelColor: 7 })
makeBadge({ label: 'build', message: 'passed', labelColor: 7 }),
).to.throw(ValidationError, 'Field `labelColor` must be of type string')
expect(() =>
makeBadge({ label: 'build', message: 'passed', format: 'png' })
makeBadge({ label: 'build', message: 'passed', format: 'png' }),
).to.throw(ValidationError, "Unexpected field 'format'")
expect(() =>
makeBadge({ label: 'build', message: 'passed', template: 'flat' })
makeBadge({ label: 'build', message: 'passed', template: 'flat' }),
).to.throw(ValidationError, "Unexpected field 'template'")
expect(() =>
makeBadge({ label: 'build', message: 'passed', foo: 'bar' })
makeBadge({ label: 'build', message: 'passed', foo: 'bar' }),
).to.throw(ValidationError, "Unexpected field 'foo'")
expect(() =>
makeBadge({
label: 'build',
message: 'passed',
style: 'something else',
})
}),
).to.throw(
ValidationError,
'Field `style` must be one of (plastic,flat,flat-square,for-the-badge,social)'
'Field `style` must be one of (plastic,flat,flat-square,for-the-badge,social)',
)
expect(() =>
makeBadge({ label: 'build', message: 'passed', style: 'popout' })
makeBadge({ label: 'build', message: 'passed', style: 'popout' }),
).to.throw(
ValidationError,
'Field `style` must be one of (plastic,flat,flat-square,for-the-badge,social)'
'Field `style` must be one of (plastic,flat,flat-square,for-the-badge,social)',
)
})
})

2
badge-maker/lib/make-badge.js
View File

@ -58,6 +58,6 @@ module.exports = function makeBadge({
logoPadding: logo && label.length ? 3 : 0,
color: toSvgColor(color),
labelColor: toSvgColor(labelColor),
})
}),
)
}

178
badge-maker/lib/make-badge.spec.js
View File

@ -6,8 +6,8 @@ const snapshot = require('snap-shot-it')
const prettier = require('prettier')
const makeBadge = require('./make-badge')
function expectBadgeToMatchSnapshot(format) {
snapshot(prettier.format(makeBadge(format), { parser: 'html' }))
async function expectBadgeToMatchSnapshot(format) {
snapshot(await prettier.format(makeBadge(format), { parser: 'html' }))
}
function testColor(color = '', colorAttr = 'color') {
@ -17,7 +17,7 @@ function testColor(color = '', colorAttr = 'color') {
message: 'Bob',
[colorAttr]: color,
format: 'json',
})
}),
).color
}
@ -67,7 +67,7 @@ describe('The badge generator', function () {
given('bluish'),
given('almostred'),
given('brightmaroon'),
given('cactus')
given('cactus'),
).expect(undefined)
})
})
@ -87,8 +87,8 @@ describe('The badge generator', function () {
.and.to.include('grown')
})
it('should match snapshot', function () {
expectBadgeToMatchSnapshot({
it('should match snapshot', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -138,14 +138,14 @@ describe('The badge generator', function () {
message: 'Bob',
format: 'svg',
style: 'unknown_style',
})
}),
).to.throw(Error, "Unknown badge style: 'unknown_style'")
})
})
describe('"flat" template badge generation', function () {
it('should match snapshots: message/label, no logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, no logo', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -155,8 +155,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message/label, with logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, with logo', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -167,8 +167,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, no logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, no logo', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -177,8 +177,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, with logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, with logo', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -188,8 +188,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, with logo and labelColor', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, with logo and labelColor', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -200,8 +200,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message/label, with links', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, with links', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -212,8 +212,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: black text when the label color is light', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: black text when the label color is light', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -223,8 +223,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: black text when the message color is light', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: black text when the message color is light', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -236,8 +236,8 @@ describe('The badge generator', function () {
})
describe('"flat-square" template badge generation', function () {
it('should match snapshots: message/label, no logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, no logo', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -247,8 +247,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message/label, with logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, with logo', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -259,8 +259,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, no logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, no logo', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -269,8 +269,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, with logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, with logo', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -280,8 +280,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, with logo and labelColor', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, with logo and labelColor', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -292,8 +292,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message/label, with links', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, with links', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -304,8 +304,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: black text when the label color is light', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: black text when the label color is light', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -315,8 +315,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: black text when the message color is light', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: black text when the message color is light', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -328,8 +328,8 @@ describe('The badge generator', function () {
})
describe('"plastic" template badge generation', function () {
it('should match snapshots: message/label, no logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, no logo', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -339,8 +339,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message/label, with logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, with logo', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -351,8 +351,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, no logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, no logo', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -361,8 +361,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, with logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, with logo', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -372,8 +372,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, with logo and labelColor', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, with logo and labelColor', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -384,8 +384,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message/label, with links', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, with links', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -396,8 +396,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: black text when the label color is light', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: black text when the label color is light', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -407,8 +407,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: black text when the message color is light', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: black text when the message color is light', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -428,7 +428,7 @@ describe('The badge generator', function () {
message: 1999,
format: 'svg',
style: 'for-the-badge',
})
}),
)
.to.include('1998')
.and.to.include('1999')
@ -441,14 +441,14 @@ describe('The badge generator', function () {
message: '1 string',
format: 'svg',
style: 'for-the-badge',
})
}),
)
.to.include('LABEL')
.and.to.include('1 STRING')
})
it('should match snapshots: message/label, no logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, no logo', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -458,8 +458,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message/label, with logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, with logo', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -470,8 +470,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, no logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, no logo', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -480,8 +480,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, with logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, with logo', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -491,8 +491,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, with logo and labelColor', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, with logo and labelColor', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -503,8 +503,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message/label, with links', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, with links', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -515,8 +515,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: black text when the label color is light', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: black text when the label color is light', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -526,8 +526,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: black text when the message color is light', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: black text when the message color is light', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -546,7 +546,7 @@ describe('The badge generator', function () {
message: 'some-value',
format: 'svg',
style: 'social',
})
}),
)
.to.include('Some-key')
.and.to.include('some-value')
@ -560,14 +560,14 @@ describe('The badge generator', function () {
message: 'some-value',
format: 'json',
style: 'social',
})
}),
)
.to.include('""')
.and.to.include('some-value')
})
it('should match snapshots: message/label, no logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, no logo', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -577,8 +577,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message/label, with logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, with logo', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -589,8 +589,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, no logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, no logo', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -599,8 +599,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, with logo', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, with logo', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -610,8 +610,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message only, with logo and labelColor', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message only, with logo and labelColor', async function () {
await expectBadgeToMatchSnapshot({
label: '',
message: 'grown',
format: 'svg',
@ -622,8 +622,8 @@ describe('The badge generator', function () {
})
})
it('should match snapshots: message/label, with links', function () {
expectBadgeToMatchSnapshot({
it('should match snapshots: message/label, with links', async function () {
await expectBadgeToMatchSnapshot({
label: 'cactus',
message: 'grown',
format: 'svg',
@ -636,8 +636,8 @@ describe('The badge generator', function () {
})
describe('badges with logos should always produce the same badge', function () {
it('badge with logo', function () {
expectBadgeToMatchSnapshot({
it('badge with logo', async function () {
await expectBadgeToMatchSnapshot({
label: 'label',
message: 'message',
format: 'svg',

4
badge-maker/lib/xml.js
View File

@ -66,7 +66,7 @@ class XmlElement {
})
.join(' ')
return stripXmlWhitespace(
`<${this.name}${attrsStr}>${content}</${this.name}>`
`<${this.name}${attrsStr}>${content}</${this.name}>`,
)
}
return stripXmlWhitespace(`<${this.name}${attrsStr}/>`)
@ -88,7 +88,7 @@ class ElementList {
typeof el.render === 'function'
? acc + el.render()
: acc + escapeXml(el),
''
'',
)
}
}

2
core/badge-urls/path-helpers.spec.js
View File

@ -7,7 +7,7 @@ describe('Badge URL helper functions', function () {
given('single trailing underscore_').expect('single trailing underscore ')
given('__double leading underscores').expect('_double leading underscores')
given('double trailing underscores__').expect(
'double trailing underscores_'
'double trailing underscores_',
)
given('treble___underscores').expect('treble_ underscores')
given('fourfold____underscores').expect('fourfold__underscores')

12
core/base-service/auth-helper.js
View File

@ -11,7 +11,7 @@ class AuthHelper {
isRequired = false,
defaultToEmptyStringForUser = false,
},
config
config,
) {
if (!userKey && !passKey) {
throw Error('Expected userKey or passKey to be set')
@ -142,7 +142,7 @@ class AuthHelper {
withBasicAuth(requestParams) {
return this._withAnyAuth(requestParams, requestParams =>
this.constructor._mergeAuth(requestParams, this._basicAuth)
this.constructor._mergeAuth(requestParams, this._basicAuth),
)
}
@ -172,13 +172,13 @@ class AuthHelper {
withBearerAuthHeader(
requestParams,
bearerKey = 'Bearer' // lgtm [js/hardcoded-credentials]
bearerKey = 'Bearer', // lgtm [js/hardcoded-credentials]
) {
return this._withAnyAuth(requestParams, requestParams =>
this.constructor._mergeHeaders(
requestParams,
this._bearerAuthHeader(bearerKey)
)
this._bearerAuthHeader(bearerKey),
),
)
}
@ -204,7 +204,7 @@ class AuthHelper {
this.constructor._mergeQueryParams(requestParams, {
...(userKey ? { [userKey]: this._user } : undefined),
...(passKey ? { [passKey]: this._pass } : undefined),
})
}),
)
}
}

43
core/base-service/auth-helper.spec.js
View File

@ -8,12 +8,13 @@ describe('AuthHelper', function () {
it('throws without userKey or passKey', function () {
expect(() => new AuthHelper({}, {})).to.throw(
Error,
'Expected userKey or passKey to be set'
'Expected userKey or passKey to be set',
)
})
it('throws without serviceKey or authorizedOrigins', function () {
expect(
() => new AuthHelper({ userKey: 'myci_user', passKey: 'myci_pass' }, {})
() =>
new AuthHelper({ userKey: 'myci_user', passKey: 'myci_pass' }, {}),
).to.throw(Error, 'Expected authorizedOrigins or serviceKey to be set')
})
it('throws when authorizedOrigins is not an array', function () {
@ -25,8 +26,8 @@ describe('AuthHelper', function () {
passKey: 'myci_pass',
authorizedOrigins: true,
},
{ private: {} }
)
{ private: {} },
),
).to.throw(Error, 'Expected authorizedOrigins to be an array of origins')
})
})
@ -35,7 +36,7 @@ describe('AuthHelper', function () {
function validate(config, privateConfig) {
return new AuthHelper(
{ authorizedOrigins: ['https://example.test'], ...config },
{ private: privateConfig }
{ private: privateConfig },
).isValid
}
test(validate, () => {
@ -43,20 +44,20 @@ describe('AuthHelper', function () {
// Fully configured user + pass.
given(
{ userKey: 'myci_user', passKey: 'myci_pass', isRequired: true },
{ myci_user: 'admin', myci_pass: 'abc123' }
{ myci_user: 'admin', myci_pass: 'abc123' },
),
given(
{ userKey: 'myci_user', passKey: 'myci_pass' },
{ myci_user: 'admin', myci_pass: 'abc123' }
{ myci_user: 'admin', myci_pass: 'abc123' },
),
// Fully configured user or pass.
given(
{ userKey: 'myci_user', isRequired: true },
{ myci_user: 'admin' }
{ myci_user: 'admin' },
),
given(
{ passKey: 'myci_pass', isRequired: true },
{ myci_pass: 'abc123' }
{ myci_pass: 'abc123' },
),
given({ userKey: 'myci_user' }, { myci_user: 'admin' }),
given({ passKey: 'myci_pass' }, { myci_pass: 'abc123' }),
@ -70,16 +71,16 @@ describe('AuthHelper', function () {
// Partly configured.
given(
{ userKey: 'myci_user', passKey: 'myci_pass', isRequired: true },
{ myci_user: 'admin' }
{ myci_user: 'admin' },
),
given(
{ userKey: 'myci_user', passKey: 'myci_pass' },
{ myci_user: 'admin' }
{ myci_user: 'admin' },
),
// Missing required config.
given(
{ userKey: 'myci_user', passKey: 'myci_pass', isRequired: true },
{}
{},
),
given({ userKey: 'myci_user', isRequired: true }, {}),
given({ passKey: 'myci_pass', isRequired: true }, {}),
@ -91,18 +92,18 @@ describe('AuthHelper', function () {
function validate(config, privateConfig) {
return new AuthHelper(
{ authorizedOrigins: ['https://example.test'], ...config },
{ private: privateConfig }
{ private: privateConfig },
)._basicAuth
}
test(validate, () => {
forCases([
given(
{ userKey: 'myci_user', passKey: 'myci_pass', isRequired: true },
{ myci_user: 'admin', myci_pass: 'abc123' }
{ myci_user: 'admin', myci_pass: 'abc123' },
),
given(
{ userKey: 'myci_user', passKey: 'myci_pass' },
{ myci_user: 'admin', myci_pass: 'abc123' }
{ myci_user: 'admin', myci_pass: 'abc123' },
),
]).expect({ username: 'admin', password: 'abc123' })
given({ userKey: 'myci_user' }, { myci_user: 'admin' }).expect({
@ -114,11 +115,11 @@ describe('AuthHelper', function () {
password: 'abc123',
})
given({ userKey: 'myci_user', passKey: 'myci_pass' }, {}).expect(
undefined
undefined,
)
given(
{ passKey: 'myci_pass', defaultToEmptyStringForUser: true },
{ myci_pass: 'abc123' }
{ myci_pass: 'abc123' },
).expect({
username: '',
password: 'abc123',
@ -168,7 +169,7 @@ describe('AuthHelper', function () {
expect(() =>
authHelper.enforceStrictSsl({
options: { https: { rejectUnauthorized: false } },
})
}),
).to.throw(InvalidParameter)
})
})
@ -192,7 +193,7 @@ describe('AuthHelper', function () {
expect(() =>
authHelper.enforceStrictSsl({
options: { https: { rejectUnauthorized: false } },
})
}),
).not.to.throw()
})
})
@ -318,7 +319,7 @@ describe('AuthHelper', function () {
},
},
private: { myci_user: 'admin', myci_pass: 'abc123' },
}
},
)
const withBasicAuth = requestOptions =>
authHelper.withBasicAuth(requestOptions)
@ -376,7 +377,7 @@ describe('AuthHelper', function () {
withBasicAuth({
url: 'https://myci.test/api',
options: { https: { rejectUnauthorized: false } },
})
}),
).to.throw(InvalidParameter)
})
})

2
core/base-service/base-graphql.js
View File

@ -91,7 +91,7 @@ class BaseGraphqlService extends BaseService {
throw exception
} else {
throw Error(
`transformErrors() must return a ShieldsRuntimeError; got ${exception}`
`transformErrors() must return a ShieldsRuntimeError; got ${exception}`,
)
}
}

30
core/base-service/base-graphql.spec.js
View File

@ -35,14 +35,14 @@ describe('BaseGraphqlService', function () {
Promise.resolve({
buffer: '{"some": "json"}',
res: { statusCode: 200 },
})
}),
)
})
it('invokes _requestFetcher', async function () {
await DummyGraphqlService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
{ handleInternalErrors: false },
)
expect(requestFetcher).to.have.been.calledOnceWith(
@ -51,7 +51,7 @@ describe('BaseGraphqlService', function () {
body: '{"query":"{\\n requiredString\\n}","variables":{}}',
headers: { Accept: 'application/json' },
method: 'POST',
}
},
)
})
@ -74,7 +74,7 @@ describe('BaseGraphqlService', function () {
await WithOptions.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
{ handleInternalErrors: false },
)
expect(requestFetcher).to.have.been.calledOnceWith(
@ -84,7 +84,7 @@ describe('BaseGraphqlService', function () {
headers: { Accept: 'application/json' },
method: 'POST',
searchParams: { queryParam: 123 },
}
},
)
})
})
@ -98,8 +98,8 @@ describe('BaseGraphqlService', function () {
expect(
await DummyGraphqlService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
message: 'some-string',
})
@ -113,8 +113,8 @@ describe('BaseGraphqlService', function () {
expect(
await DummyGraphqlService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
isError: true,
color: 'lightgray',
@ -130,8 +130,8 @@ describe('BaseGraphqlService', function () {
expect(
await DummyGraphqlService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
isError: true,
color: 'lightgray',
@ -149,8 +149,8 @@ describe('BaseGraphqlService', function () {
expect(
await DummyGraphqlService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
isError: true,
color: 'lightgray',
@ -188,8 +188,8 @@ describe('BaseGraphqlService', function () {
expect(
await WithErrorHandler.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
isError: true,
color: 'lightgray',

22
core/base-service/base-json.spec.js
View File

@ -28,21 +28,21 @@ describe('BaseJsonService', function () {
Promise.resolve({
buffer: '{"some": "json"}',
res: { statusCode: 200 },
})
}),
)
})
it('invokes _requestFetcher', async function () {
await DummyJsonService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
{ handleInternalErrors: false },
)
expect(requestFetcher).to.have.been.calledOnceWith(
'http://example.com/foo.json',
{
headers: { Accept: 'application/json' },
}
},
)
})
@ -60,7 +60,7 @@ describe('BaseJsonService', function () {
await WithOptions.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
{ handleInternalErrors: false },
)
expect(requestFetcher).to.have.been.calledOnceWith(
@ -69,7 +69,7 @@ describe('BaseJsonService', function () {
headers: { Accept: 'application/json' },
method: 'POST',
searchParams: { queryParam: 123 },
}
},
)
})
})
@ -83,8 +83,8 @@ describe('BaseJsonService', function () {
expect(
await DummyJsonService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
message: 'some-string',
})
@ -98,8 +98,8 @@ describe('BaseJsonService', function () {
expect(
await DummyJsonService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
isError: true,
color: 'lightgray',
@ -115,8 +115,8 @@ describe('BaseJsonService', function () {
expect(
await DummyJsonService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
isError: true,
color: 'lightgray',

4
core/base-service/base-static.js
View File

@ -33,14 +33,14 @@ export default class BaseStaticService extends BaseService {
{},
serviceConfig,
namedParams,
queryParams
queryParams,
)
const badgeData = coalesceBadge(
queryParams,
serviceData,
this.defaultBadgeData,
this
this,
)
// The final capture group is the extension.

24
core/base-service/base-svg-scraping.spec.js
View File

@ -28,7 +28,7 @@ describe('BaseSvgScrapingService', function () {
describe('valueFromSvgBadge', function () {
it('should find the correct value', function () {
expect(BaseSvgScrapingService.valueFromSvgBadge(exampleSvg)).to.equal(
exampleMessage
exampleMessage,
)
})
})
@ -40,21 +40,21 @@ describe('BaseSvgScrapingService', function () {
Promise.resolve({
buffer: exampleSvg,
res: { statusCode: 200 },
})
}),
)
})
it('invokes _requestFetcher with the expected header', async function () {
await DummySvgScrapingService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
{ handleInternalErrors: false },
)
expect(requestFetcher).to.have.been.calledOnceWith(
'http://example.com/foo.svg',
{
headers: { Accept: 'image/svg+xml' },
}
},
)
})
@ -75,7 +75,7 @@ describe('BaseSvgScrapingService', function () {
await WithCustomOptions.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
{ handleInternalErrors: false },
)
expect(requestFetcher).to.have.been.calledOnceWith(
@ -84,7 +84,7 @@ describe('BaseSvgScrapingService', function () {
method: 'POST',
headers: { Accept: 'image/svg+xml' },
searchParams: { queryParam: 123 },
}
},
)
})
})
@ -98,8 +98,8 @@ describe('BaseSvgScrapingService', function () {
expect(
await DummySvgScrapingService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
message: exampleMessage,
})
@ -124,8 +124,8 @@ describe('BaseSvgScrapingService', function () {
expect(
await WithValueMatcher.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
message: 'a different message',
})
@ -139,8 +139,8 @@ describe('BaseSvgScrapingService', function () {
expect(
await DummySvgScrapingService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
isError: true,
color: 'lightgray',

26
core/base-service/base-xml.spec.js
View File

@ -28,21 +28,21 @@ describe('BaseXmlService', function () {
Promise.resolve({
buffer: '<requiredString>some-string</requiredString>',
res: { statusCode: 200 },
})
}),
)
})
it('invokes _requestFetcher', async function () {
await DummyXmlService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
{ handleInternalErrors: false },
)
expect(requestFetcher).to.have.been.calledOnceWith(
'http://example.com/foo.xml',
{
headers: { Accept: 'application/xml, text/xml' },
}
},
)
})
@ -62,7 +62,7 @@ describe('BaseXmlService', function () {
await WithCustomOptions.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
{ handleInternalErrors: false },
)
expect(requestFetcher).to.have.been.calledOnceWith(
@ -71,7 +71,7 @@ describe('BaseXmlService', function () {
headers: { Accept: 'application/xml, text/xml' },
method: 'POST',
searchParams: { queryParam: 123 },
}
},
)
})
})
@ -85,8 +85,8 @@ describe('BaseXmlService', function () {
expect(
await DummyXmlService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
message: 'some-string',
})
@ -112,8 +112,8 @@ describe('BaseXmlService', function () {
expect(
await DummyXmlServiceWithParserOption.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
message: 'some-string with trailing whitespace ',
})
@ -127,8 +127,8 @@ describe('BaseXmlService', function () {
expect(
await DummyXmlService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
isError: true,
color: 'lightgray',
@ -144,8 +144,8 @@ describe('BaseXmlService', function () {
expect(
await DummyXmlService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
isError: true,
color: 'lightgray',

22
core/base-service/base-yaml.spec.js
View File

@ -44,14 +44,14 @@ describe('BaseYamlService', function () {
Promise.resolve({
buffer: expectedYaml,
res: { statusCode: 200 },
})
}),
)
})
it('invokes _requestFetcher', async function () {
await DummyYamlService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
{ handleInternalErrors: false },
)
expect(requestFetcher).to.have.been.calledOnceWith(
@ -61,7 +61,7 @@ describe('BaseYamlService', function () {
Accept:
'text/x-yaml, text/yaml, application/x-yaml, application/yaml, text/plain',
},
}
},
)
})
@ -79,7 +79,7 @@ describe('BaseYamlService', function () {
await WithOptions.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
{ handleInternalErrors: false },
)
expect(requestFetcher).to.have.been.calledOnceWith(
@ -91,7 +91,7 @@ describe('BaseYamlService', function () {
},
method: 'POST',
searchParams: { queryParam: 123 },
}
},
)
})
})
@ -105,8 +105,8 @@ describe('BaseYamlService', function () {
expect(
await DummyYamlService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
message: 'some-string',
})
@ -120,8 +120,8 @@ describe('BaseYamlService', function () {
expect(
await DummyYamlService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
isError: true,
color: 'lightgray',
@ -137,8 +137,8 @@ describe('BaseYamlService', function () {
expect(
await DummyYamlService.invoke(
{ requestFetcher },
{ handleInternalErrors: false }
)
{ handleInternalErrors: false },
),
).to.deep.equal({
isError: true,
color: 'lightgray',

44
core/base-service/base.js
View File

@ -44,7 +44,7 @@ const optionalStringWhenNamedLogoPresent = Joi.alternatives().conditional(
{
is: Joi.string().required(),
then: Joi.string(),
}
},
)
const optionalNumberWhenAnyLogoPresent = Joi.alternatives()
@ -183,11 +183,11 @@ class BaseService {
Joi.assert(
this.defaultBadgeData,
defaultBadgeDataSchema,
`Default badge data for ${this.name}`
`Default badge data for ${this.name}`,
)
this.examples.forEach((example, index) =>
validateExample(example, index, this)
validateExample(example, index, this),
)
}
@ -197,7 +197,7 @@ class BaseService {
const queryParams = getQueryParamNames(this.route)
const examples = this.examples.map((example, index) =>
transformExample(example, index, this)
transformExample(example, index, this),
)
let route
@ -218,7 +218,7 @@ class BaseService {
constructor(
{ requestFetcher, authHelper, metricHelper },
{ handleInternalErrors }
{ handleInternalErrors },
) {
this._requestFetcher = requestFetcher
this.authHelper = authHelper
@ -234,9 +234,9 @@ class BaseService {
const params = new URLSearchParams(
Object.fromEntries(
Object.entries(options.searchParams).filter(
([k, v]) => v !== undefined
)
)
([k, v]) => v !== undefined,
),
),
)
logUrl = `${url}?${params.toString()}`
delete logOptions.searchParams
@ -244,12 +244,12 @@ class BaseService {
logTrace(
emojic.bowAndArrow,
'Request',
`${logUrl}\n${JSON.stringify(logOptions, null, 2)}`
`${logUrl}\n${JSON.stringify(logOptions, null, 2)}`,
)
const { res, buffer } = await this._requestFetcher(
url,
options,
systemErrors
systemErrors,
)
await this._meterResponse(res, buffer)
logTrace(emojic.dart, 'Response status code', res.statusCode)
@ -279,7 +279,7 @@ class BaseService {
prettyErrorMessage = 'invalid response data',
includeKeys = false,
allowAndStripUnknownKeys = true,
} = {}
} = {},
) {
return validate(
{
@ -291,7 +291,7 @@ class BaseService {
allowAndStripUnknownKeys,
},
data,
schema
schema,
)
}
@ -347,7 +347,7 @@ class BaseService {
'unhandledError',
emojic.boom,
'Unhandled internal error',
error
error,
)
) {
// This is where we end up if an unhandled exception is thrown in
@ -365,7 +365,7 @@ class BaseService {
'unhandledError',
emojic.boom,
'Unhandled internal error',
error
error,
)
throw error
}
@ -375,7 +375,7 @@ class BaseService {
context = {},
config = {},
namedParams = {},
queryParams = {}
queryParams = {},
) {
trace.logTrace('inbound', emojic.womanCook, 'Service class', this.name)
trace.logTrace('inbound', emojic.ticket, 'Named params', namedParams)
@ -409,13 +409,13 @@ class BaseService {
traceSuccessMessage: 'Query params after validation',
},
queryParams,
queryParamSchema
queryParamSchema,
)
trace.logTrace(
'inbound',
emojic.crayon,
'Query params after validation',
queryParams
queryParams,
)
} catch (error) {
serviceError = error
@ -429,7 +429,7 @@ class BaseService {
try {
serviceData = await serviceInstance.handle(
namedParams,
transformedQueryParams
transformedQueryParams,
)
serviceInstance._validateServiceData(serviceData)
} catch (error) {
@ -454,7 +454,7 @@ class BaseService {
librariesIoApiProvider,
metricInstance,
},
serviceConfig
serviceConfig,
) {
const { cacheHeaders: cacheHeaderConfig } = serviceConfig
const { regex, captureNames } = prepareRoute(this.route)
@ -482,14 +482,14 @@ class BaseService {
},
serviceConfig,
namedParams,
queryParams
queryParams,
)
const badgeData = coalesceBadge(
queryParams,
serviceData,
this.defaultBadgeData,
this
this,
)
// The final capture group is the extension.
const format = (match.slice(-1)[0] || '.svg').replace(/^\./, '')
@ -498,7 +498,7 @@ class BaseService {
metricHandle.noteResponseSent()
},
cacheLength: this._cacheLength,
})
}),
)
}
}

78
core/base-service/base.spec.js
View File

@ -72,8 +72,8 @@ describe('BaseService', function () {
{},
defaultConfig,
{ namedParamA: 'bar.bar.bar' },
{ queryParamA: '!' }
)
{ queryParamA: '!' },
),
).to.deep.equal({
message: 'Hello namedParamA: bar.bar.bar with queryParamA: !',
})
@ -85,8 +85,8 @@ describe('BaseService', function () {
{},
defaultConfig,
{ namedParamA: 'bar.bar.bar' },
{ queryParamA: ['foo', 'bar'] }
)
{ queryParamA: ['foo', 'bar'] },
),
).to.deep.equal({
color: 'red',
isError: true,
@ -97,13 +97,13 @@ describe('BaseService', function () {
describe('Required overrides', function () {
it('Should throw if render() is not overridden', function () {
expect(() => BaseService.render()).to.throw(
/^render\(\) function not implemented for BaseService$/
/^render\(\) function not implemented for BaseService$/,
)
})
it('Should throw if route is not overridden', function () {
return expect(BaseService.invoke({}, {}, {})).to.be.rejectedWith(
/^Route not defined for BaseService$/
/^Route not defined for BaseService$/,
)
})
@ -112,13 +112,13 @@ describe('BaseService', function () {
}
it('Should throw if handle() is not overridden', function () {
return expect(WithRoute.invoke({}, {}, {})).to.be.rejectedWith(
/^Handler not implemented for WithRoute$/
/^Handler not implemented for WithRoute$/,
)
})
it('Should throw if category is not overridden', function () {
expect(() => BaseService.category).to.throw(
/^Category not set for BaseService$/
/^Category not set for BaseService$/,
)
})
})
@ -135,25 +135,25 @@ describe('BaseService', function () {
{},
defaultConfig,
{ namedParamA: 'bar.bar.bar' },
{ queryParamA: '!' }
{ queryParamA: '!' },
)
expect(trace.logTrace).to.be.calledWithMatch(
'inbound',
sinon.match.string,
'Service class',
'DummyService'
'DummyService',
)
expect(trace.logTrace).to.be.calledWith(
'inbound',
sinon.match.string,
'Named params',
{ namedParamA: 'bar.bar.bar' }
{ namedParamA: 'bar.bar.bar' },
)
expect(trace.logTrace).to.be.calledWith(
'inbound',
sinon.match.string,
'Query params after validation',
{ queryParamA: '!' }
{ queryParamA: '!' },
)
})
})
@ -171,7 +171,7 @@ describe('BaseService', function () {
const serviceData = await LinkService.invoke(
{},
{ handleInternalErrors: false },
{ namedParamA: 'bar.bar.bar' }
{ namedParamA: 'bar.bar.bar' },
)
expect(serviceData).to.deep.equal({
@ -194,7 +194,7 @@ describe('BaseService', function () {
await ThrowingService.invoke(
{},
{ handleInternalErrors: false },
{ namedParamA: 'bar.bar.bar' }
{ namedParamA: 'bar.bar.bar' },
)
expect.fail('Expected to throw')
} catch (e) {
@ -212,7 +212,7 @@ describe('BaseService', function () {
await ThrowingService.invoke(
{},
{ handleInternalErrors: false },
{ namedParamA: 'bar.bar.bar' }
{ namedParamA: 'bar.bar.bar' },
)
expect.fail('Expected to throw')
} catch (e) {
@ -233,8 +233,8 @@ describe('BaseService', function () {
await ThrowingService.invoke(
{},
{ handleInternalErrors: true },
{ namedParamA: 'bar.bar.bar' }
)
{ namedParamA: 'bar.bar.bar' },
),
).to.deep.equal({
isError: true,
color: 'lightgray',
@ -251,7 +251,7 @@ describe('BaseService', function () {
}
}
expect(
await ThrowingService.invoke({}, {}, { namedParamA: 'bar.bar.bar' })
await ThrowingService.invoke({}, {}, { namedParamA: 'bar.bar.bar' }),
).to.deep.equal({
isError: true,
color: 'red',
@ -266,7 +266,7 @@ describe('BaseService', function () {
}
}
expect(
await ThrowingService.invoke({}, {}, { namedParamA: 'bar.bar.bar' })
await ThrowingService.invoke({}, {}, { namedParamA: 'bar.bar.bar' }),
).to.deep.equal({
isError: true,
color: 'lightgray',
@ -281,7 +281,7 @@ describe('BaseService', function () {
}
}
expect(
await ThrowingService.invoke({}, {}, { namedParamA: 'bar.bar.bar' })
await ThrowingService.invoke({}, {}, { namedParamA: 'bar.bar.bar' }),
).to.deep.equal({
isError: true,
color: 'lightgray',
@ -296,7 +296,7 @@ describe('BaseService', function () {
}
}
expect(
await ThrowingService.invoke({}, {}, { namedParamA: 'bar.bar.bar' })
await ThrowingService.invoke({}, {}, { namedParamA: 'bar.bar.bar' }),
).to.deep.equal({
isError: true,
color: 'lightgray',
@ -311,7 +311,7 @@ describe('BaseService', function () {
}
}
expect(
await ThrowingService.invoke({}, {}, { namedParamA: 'bar.bar.bar' })
await ThrowingService.invoke({}, {}, { namedParamA: 'bar.bar.bar' }),
).to.deep.equal({
isError: true,
color: 'red',
@ -336,7 +336,7 @@ describe('BaseService', function () {
mockHandleRequest = sinon.spy()
DummyService.register(
{ camp: mockCamp, handleRequest: mockHandleRequest },
defaultConfig
defaultConfig,
)
})
@ -413,8 +413,8 @@ describe('BaseService', function () {
expect(() =>
DummyService._validate(
{ requiredString: ['this', "shouldn't", 'work'] },
dummySchema
)
dummySchema,
),
)
.to.throw()
.instanceof(InvalidResponse)
@ -436,7 +436,7 @@ describe('BaseService', function () {
})
const serviceInstance = new DummyService(
{ requestFetcher },
defaultConfig
defaultConfig,
)
const url = 'some-url'
@ -453,14 +453,14 @@ describe('BaseService', function () {
`${url}?param1=foobar\n${JSON.stringify(
{ headers: options.headers },
null,
2
)}`
2,
)}`,
)
expect(trace.logTrace).to.be.calledWithMatch(
'fetch',
sinon.match.string,
'Response status code',
200
200,
)
})
@ -471,7 +471,7 @@ describe('BaseService', function () {
})
const serviceInstance = new DummyService(
{ requestFetcher },
defaultConfig
defaultConfig,
)
try {
@ -504,17 +504,17 @@ describe('BaseService', function () {
const serviceInstance =
new DummyServiceWithServiceResponseSizeMetricEnabled(
{ requestFetcher, metricHelper },
defaultConfig
defaultConfig,
)
await serviceInstance._request({ url })
expect(await register.getSingleMetricAsString('service_response_bytes'))
.to.contain(
'service_response_bytes_bucket{le="65536",category="other",family="undefined",service="dummy_service_with_service_response_size_metric_enabled"} 0\n'
'service_response_bytes_bucket{le="65536",category="other",family="undefined",service="dummy_service_with_service_response_size_metric_enabled"} 0\n',
)
.and.to.contain(
'service_response_bytes_bucket{le="131072",category="other",family="undefined",service="dummy_service_with_service_response_size_metric_enabled"} 1\n'
'service_response_bytes_bucket{le="131072",category="other",family="undefined",service="dummy_service_with_service_response_size_metric_enabled"} 1\n',
)
})
@ -529,13 +529,13 @@ describe('BaseService', function () {
})
const serviceInstance = new DummyService(
{ requestFetcher, metricHelper },
defaultConfig
defaultConfig,
)
await serviceInstance._request({ url })
expect(
await register.getSingleMetricAsString('service_response_bytes')
await register.getSingleMetricAsString('service_response_bytes'),
).to.not.contain('service_response_bytes_bucket')
})
})
@ -565,8 +565,8 @@ describe('BaseService', function () {
},
private: { myci_pass: 'abc123' },
},
{ namedParamA: 'bar.bar.bar' }
)
{ namedParamA: 'bar.bar.bar' },
),
).to.deep.equal({ message: 'The CI password is abc123' })
})
@ -583,8 +583,8 @@ describe('BaseService', function () {
},
{
namedParamA: 'bar.bar.bar',
}
)
},
),
).to.deep.equal({
color: 'lightgray',
isError: true,

2
core/base-service/cache-headers.js
View File

@ -41,7 +41,7 @@ function coalesceCacheLength({
const cacheLength = coalesce(
serviceOverrideCacheLengthSeconds,
serviceDefaultCacheLengthSeconds,
defaultCacheLengthSeconds
defaultCacheLengthSeconds,
)
// Overrides can apply _more_ caching, but not less. Query param overriding

16
core/base-service/cache-headers.spec.js
View File

@ -125,7 +125,7 @@ describe('Cache header functions', function () {
it('should set the expected Cache-Control header', function () {
expect(res._headers['cache-control']).to.equal(
'no-cache, no-store, must-revalidate'
'no-cache, no-store, must-revalidate',
)
})
@ -141,7 +141,7 @@ describe('Cache header functions', function () {
it('should set the expected Cache-Control header', function () {
expect(res._headers['cache-control']).to.equal(
'max-age=123, s-maxage=123'
'max-age=123, s-maxage=123',
)
})
@ -156,7 +156,7 @@ describe('Cache header functions', function () {
it('sets the expected fields', function () {
const expectedFields = ['date', 'cache-control', 'expires']
expectedFields.forEach(field =>
expect(res._headers[field]).to.equal(undefined)
expect(res._headers[field]).to.equal(undefined),
)
setCacheHeaders({
@ -169,7 +169,7 @@ describe('Cache header functions', function () {
expectedFields.forEach(field =>
expect(res._headers[field])
.to.be.a('string')
.and.have.lengthOf.at.least(1)
.and.have.lengthOf.at.least(1),
)
})
})
@ -181,7 +181,7 @@ describe('Cache header functions', function () {
it('should set the expected Cache-Control header', function () {
expect(res._headers['cache-control']).to.equal(
`max-age=${24 * 3600}, s-maxage=${24 * 3600}`
`max-age=${24 * 3600}, s-maxage=${24 * 3600}`,
)
})
@ -190,7 +190,7 @@ describe('Cache header functions', function () {
expect(new Date(lastModified)).to.be.withinTime(
// Within the last 60 seconds.
new Date(Date.now() - 60 * 1000),
new Date()
new Date(),
)
})
})
@ -221,7 +221,7 @@ describe('Cache header functions', function () {
})
expect(serverHasBeenUpSinceResourceCached(req)).to.equal(false)
})
}
},
)
context(
'when the If-Modified-Since header is after the process started',
@ -233,7 +233,7 @@ describe('Cache header functions', function () {
})
expect(serverHasBeenUpSinceResourceCached(req)).to.equal(true)
})
}
},
)
})
})

2
core/base-service/check-error-response.js
View File

@ -13,7 +13,7 @@ export default function checkErrorResponse(httpErrors = {}) {
error = new NotFound({ prettyMessage: httpErrors[404] })
} else if (res.statusCode !== 200) {
const underlying = Error(
`Got status code ${res.statusCode} (expected 200)`
`Got status code ${res.statusCode} (expected 200)`,
)
const props = { underlyingError: underlying }
if (httpErrors[res.statusCode] !== undefined) {

14
core/base-service/check-error-response.spec.js
View File

@ -56,7 +56,7 @@ describe('async error handler', function () {
} catch (e) {
expect(e).to.be.an.instanceof(InvalidResponse)
expect(e.message).to.equal(
'Invalid Response: Got status code 429 (expected 200)'
'Invalid Response: Got status code 429 (expected 200)',
)
expect(e.prettyMessage).to.equal('rate limited by upstream service')
expect(e.response).to.equal(res)
@ -72,10 +72,10 @@ describe('async error handler', function () {
} catch (e) {
expect(e).to.be.an.instanceof(InvalidResponse)
expect(e.message).to.equal(
'Invalid Response: Got status code 429 (expected 200)'
'Invalid Response: Got status code 429 (expected 200)',
)
expect(e.prettyMessage).to.equal(
"terribly sorry but that's one too many requests"
"terribly sorry but that's one too many requests",
)
}
})
@ -90,7 +90,7 @@ describe('async error handler', function () {
} catch (e) {
expect(e).to.be.an.instanceof(InvalidResponse)
expect(e.message).to.equal(
'Invalid Response: Got status code 499 (expected 200)'
'Invalid Response: Got status code 499 (expected 200)',
)
expect(e.prettyMessage).to.equal('invalid')
expect(e.response).to.equal(res)
@ -106,7 +106,7 @@ describe('async error handler', function () {
} catch (e) {
expect(e).to.be.an.instanceof(InvalidResponse)
expect(e.message).to.equal(
'Invalid Response: Got status code 403 (expected 200)'
'Invalid Response: Got status code 403 (expected 200)',
)
expect(e.prettyMessage).to.equal('access denied')
}
@ -122,7 +122,7 @@ describe('async error handler', function () {
} catch (e) {
expect(e).to.be.an.instanceof(Inaccessible)
expect(e.message).to.equal(
'Inaccessible: Got status code 503 (expected 200)'
'Inaccessible: Got status code 503 (expected 200)',
)
expect(e.prettyMessage).to.equal('inaccessible')
expect(e.response).to.equal(res)
@ -138,7 +138,7 @@ describe('async error handler', function () {
} catch (e) {
expect(e).to.be.an.instanceof(Inaccessible)
expect(e.message).to.equal(
'Inaccessible: Got status code 500 (expected 200)'
'Inaccessible: Got status code 500 (expected 200)',
)
expect(e.prettyMessage).to.equal('server overloaded')
}

8
core/base-service/coalesce-badge.js
View File

@ -36,7 +36,7 @@ export default function coalesceBadge(
serviceData,
// These two parameters were kept separate to make tests clearer.
defaultBadgeData,
{ category, _cacheLength: defaultCacheSeconds } = {}
{ category, _cacheLength: defaultCacheSeconds } = {},
) {
// The "overrideX" naming is based on services that provide badge
// parameters themselves, which can be overridden by a query string
@ -141,7 +141,7 @@ export default function coalesceBadge(
} else {
namedLogo = coalesce(
serviceNamedLogo,
style === 'social' ? defaultNamedLogo : undefined
style === 'social' ? defaultNamedLogo : undefined,
)
namedLogoColor = coalesce(overrideLogoColor, serviceLogoColor)
}
@ -166,13 +166,13 @@ export default function coalesceBadge(
isError ? undefined : overrideColor,
serviceColor,
defaultColor,
'lightgrey'
'lightgrey',
),
labelColor: coalesce(
// In case of an error, disregard user's color override.
isError ? undefined : overrideLabelColor,
serviceLabelColor,
defaultLabelColor
defaultLabelColor,
),
style,
namedLogo,

74
core/base-service/coalesce-badge.spec.js
View File

@ -25,7 +25,7 @@ describe('coalesceBadge', function () {
it('overrides the label', function () {
expect(
coalesceBadge({ label: 'purr count' }, { label: 'purrs' }, {})
coalesceBadge({ label: 'purr count' }, { label: 'purrs' }, {}),
).to.include({ label: 'purr count' })
})
})
@ -54,11 +54,11 @@ describe('coalesceBadge', function () {
it('overrides the color', function () {
expect(
coalesceBadge({ color: '10ADED' }, { color: 'red' }, {})
coalesceBadge({ color: '10ADED' }, { color: 'red' }, {}),
).to.include({ color: '10ADED' })
// also expected for legacy name
expect(
coalesceBadge({ colorB: 'B0ADED' }, { color: 'red' }, {})
coalesceBadge({ colorB: 'B0ADED' }, { color: 'red' }, {}),
).to.include({ color: 'B0ADED' })
})
@ -68,16 +68,16 @@ describe('coalesceBadge', function () {
coalesceBadge(
{ color: '10ADED' },
{ isError: true, color: 'lightgray' },
{}
)
{},
),
).to.include({ color: 'lightgray' })
// also expected for legacy name
expect(
coalesceBadge(
{ colorB: 'B0ADED' },
{ isError: true, color: 'lightgray' },
{}
)
{},
),
).to.include({ color: 'lightgray' })
})
})
@ -102,11 +102,11 @@ describe('coalesceBadge', function () {
it('overrides the label color', function () {
expect(
coalesceBadge({ labelColor: '42f483' }, { color: 'green' }, {})
coalesceBadge({ labelColor: '42f483' }, { color: 'green' }, {}),
).to.include({ labelColor: '42f483' })
// also expected for legacy name
expect(
coalesceBadge({ colorA: 'B2f483' }, { color: 'green' }, {})
coalesceBadge({ colorA: 'B2f483' }, { color: 'green' }, {}),
).to.include({ labelColor: 'B2f483' })
})
@ -116,8 +116,8 @@ describe('coalesceBadge', function () {
// Scoutcamp converts numeric query params to numbers.
{ color: 123 },
{ color: 'green' },
{}
)
{},
),
).to.include({ color: '123' })
// also expected for legacy name
expect(
@ -125,8 +125,8 @@ describe('coalesceBadge', function () {
// Scoutcamp converts numeric query params to numbers.
{ colorB: 123 },
{ color: 'green' },
{}
)
{},
),
).to.include({ color: '123' })
})
})
@ -140,7 +140,7 @@ describe('coalesceBadge', function () {
it('when a social badge, uses the default named logo', function () {
// .not.be.empty for confidence that nothing has changed with `getShieldsIcon()`.
expect(
coalesceBadge({ style: 'social' }, {}, { namedLogo: 'appveyor' }).logo
coalesceBadge({ style: 'social' }, {}, { namedLogo: 'appveyor' }).logo,
).to.equal(getSimpleIcon({ name: 'appveyor' })).and.not.be.empty
})
@ -149,28 +149,28 @@ describe('coalesceBadge', function () {
namedLogo: 'npm',
})
expect(coalesceBadge({}, { namedLogo: 'npm' }, {}).logo).to.equal(
getShieldsIcon({ name: 'npm' })
getShieldsIcon({ name: 'npm' }),
).and.not.to.be.empty
})
it('applies the named monochrome logo with color', function () {
expect(
coalesceBadge({}, { namedLogo: 'dependabot', logoColor: 'blue' }, {})
.logo
.logo,
).to.equal(getShieldsIcon({ name: 'dependabot', color: 'blue' })).and.not
.to.be.empty
})
it('applies the named multicolored logo with color', function () {
expect(
coalesceBadge({}, { namedLogo: 'npm', logoColor: 'blue' }, {}).logo
coalesceBadge({}, { namedLogo: 'npm', logoColor: 'blue' }, {}).logo,
).to.equal(getSimpleIcon({ name: 'npm', color: 'blue' })).and.not.to.be
.empty
})
it('overrides the logo', function () {
expect(
coalesceBadge({ logo: 'npm' }, { namedLogo: 'appveyor' }, {}).logo
coalesceBadge({ logo: 'npm' }, { namedLogo: 'appveyor' }, {}).logo,
).to.equal(getShieldsIcon({ name: 'npm' })).and.not.be.empty
})
@ -179,8 +179,8 @@ describe('coalesceBadge', function () {
coalesceBadge(
{ logo: 'dependabot', logoColor: 'blue' },
{ namedLogo: 'appveyor' },
{}
).logo
{},
).logo,
).to.equal(getShieldsIcon({ name: 'dependabot', color: 'blue' })).and.not
.be.empty
})
@ -190,8 +190,8 @@ describe('coalesceBadge', function () {
coalesceBadge(
{ logo: 'npm', logoColor: 'blue' },
{ namedLogo: 'appveyor' },
{}
).logo
{},
).logo,
).to.equal(getSimpleIcon({ name: 'npm', color: 'blue' })).and.not.be.empty
})
@ -205,8 +205,8 @@ describe('coalesceBadge', function () {
logoPosition: -3,
logoWidth: 100,
},
{}
).logo
{},
).logo,
).to.equal(getShieldsIcon({ name: 'npm' })).and.not.be.empty
})
@ -215,8 +215,8 @@ describe('coalesceBadge', function () {
coalesceBadge(
{ logoColor: 'blue' },
{ namedLogo: 'dependabot', logoColor: 'red' },
{}
).logo
{},
).logo,
).to.equal(getShieldsIcon({ name: 'dependabot', color: 'blue' })).and.not
.be.empty
})
@ -226,8 +226,8 @@ describe('coalesceBadge', function () {
coalesceBadge(
{ logoColor: 'blue' },
{ namedLogo: 'npm', logoColor: 'red' },
{}
).logo
{},
).logo,
).to.equal(getSimpleIcon({ name: 'npm', color: 'blue' })).and.not.be.empty
})
@ -235,7 +235,7 @@ describe('coalesceBadge', function () {
it('overrides logoSvg', function () {
const logoSvg = 'data:image/svg+xml;base64,PHN2ZyB4bWxu'
expect(coalesceBadge({ logo: 'npm' }, { logoSvg }, {}).logo).to.equal(
getShieldsIcon({ name: 'npm' })
getShieldsIcon({ name: 'npm' }),
).and.not.be.empty
})
})
@ -244,7 +244,7 @@ describe('coalesceBadge', function () {
it('overrides the logo with custom svg', function () {
const logoSvg = 'data:image/svg+xml;base64,PHN2ZyB4bWxu'
expect(
coalesceBadge({ logo: logoSvg }, { namedLogo: 'appveyor' }, {})
coalesceBadge({ logo: logoSvg }, { namedLogo: 'appveyor' }, {}),
).to.include({ logo: logoSvg })
})
@ -254,8 +254,8 @@ describe('coalesceBadge', function () {
coalesceBadge(
{ logo: logoSvg, logoColor: 'brightgreen' },
{ namedLogo: 'appveyor' },
{}
)
{},
),
).to.include({ logo: logoSvg })
})
})
@ -269,7 +269,7 @@ describe('coalesceBadge', function () {
it('applies the logo width', function () {
expect(
coalesceBadge({}, { namedLogo: 'npm', logoWidth: 275 }, {})
coalesceBadge({}, { namedLogo: 'npm', logoWidth: 275 }, {}),
).to.include({ logoWidth: 275 })
})
})
@ -283,7 +283,7 @@ describe('coalesceBadge', function () {
it('applies the logo position', function () {
expect(
coalesceBadge({}, { namedLogo: 'npm', logoPosition: -10 }, {})
coalesceBadge({}, { namedLogo: 'npm', logoPosition: -10 }, {}),
).to.include({ logoPosition: -10 })
})
})
@ -296,8 +296,8 @@ describe('coalesceBadge', function () {
{
link: 'https://circleci.com/workflow-run/184ef3de-4836-4805-a2e4-0ceba099f92d',
},
{}
).links
{},
).links,
).to.deep.equal(['https://circleci.com/gh/badges/daily-tests'])
})
})
@ -328,7 +328,7 @@ describe('coalesceBadge', function () {
describe('Cache length', function () {
it('overrides the cache length', function () {
expect(
coalesceBadge({ style: 'pill' }, { cacheSeconds: 123 }, {})
coalesceBadge({ style: 'pill' }, { cacheSeconds: 123 }, {}),
).to.include({ cacheLengthSeconds: 123 })
})
})

2
core/base-service/deprecated-service.js
View File

@ -20,7 +20,7 @@ function deprecatedService(attrs) {
const { route, name, label, category, examples, message } = Joi.attempt(
attrs,
attrSchema,
`Deprecated service for ${attrs.route.base}`
`Deprecated service for ${attrs.route.base}`,
)
return class DeprecatedService extends BaseService {

28
core/base-service/examples.js
View File

@ -6,7 +6,7 @@ import { makeFullUrl } from './route.js'
const optionalObjectOfKeyValues = Joi.object().pattern(
/./,
Joi.string().allow(null)
Joi.string().allow(null),
)
const schema = Joi.object({
@ -32,19 +32,19 @@ function validateExample(example, index, ServiceClass) {
const result = Joi.attempt(
example,
schema,
`Example for ${ServiceClass.name} at index ${index}`
`Example for ${ServiceClass.name} at index ${index}`,
)
const { pattern, namedParams } = result
if (!pattern && !ServiceClass.route.pattern) {
throw new Error(
`Example for ${ServiceClass.name} at index ${index} does not declare a pattern`
`Example for ${ServiceClass.name} at index ${index} does not declare a pattern`,
)
}
if (pattern === ServiceClass.route.pattern) {
throw new Error(
`Example for ${ServiceClass.name} at index ${index} declares a redundant pattern which should be removed`
`Example for ${ServiceClass.name} at index ${index} declares a redundant pattern which should be removed`,
)
}
@ -57,7 +57,7 @@ function validateExample(example, index, ServiceClass) {
throw Error(
`In example for ${
ServiceClass.name
} at index ${index}, ${e.message.toLowerCase()}`
} at index ${index}, ${e.message.toLowerCase()}`,
)
}
// Make sure there are no extra keys.
@ -73,8 +73,8 @@ function validateExample(example, index, ServiceClass) {
`In example for ${
ServiceClass.name
} at index ${index}, namedParams contains unknown keys: ${extraKeys.join(
', '
)}`
', ',
)}`,
)
}
@ -86,22 +86,22 @@ function validateExample(example, index, ServiceClass) {
`In example for ${
ServiceClass.name
} at index ${index}, keywords contains words that are less than two characters long: ${tinyKeywords.join(
', '
)}`
', ',
)}`,
)
}
// Make sure none of the keywords are already included in the title.
const title = (example.title || ServiceClass.name).toLowerCase()
const redundantKeywords = example.keywords.filter(k =>
title.includes(k.toLowerCase())
title.includes(k.toLowerCase()),
)
if (redundantKeywords.length) {
throw Error(
`In example for ${
ServiceClass.name
} at index ${index}, keywords contains words that are already in the title: ${redundantKeywords.join(
', '
)}`
', ',
)}`,
)
}
}
@ -126,7 +126,7 @@ function transformExample(inExample, index, ServiceClass) {
{},
staticPreview,
ServiceClass.defaultBadgeData,
ServiceClass
ServiceClass,
)
const category = categories.find(c => c.id === ServiceClass.category)
@ -135,7 +135,7 @@ function transformExample(inExample, index, ServiceClass) {
example: {
pattern: makeFullUrl(
ServiceClass.route.base,
pattern || ServiceClass.route.pattern
pattern || ServiceClass.route.pattern,
),
namedParams,
queryParams,

10
core/base-service/examples.spec.js
View File

@ -16,7 +16,7 @@ describe('validateExample function', function () {
validExamples.forEach(example => {
expect(() =>
validateExample(example, 0, { route: {}, name: 'mockService' })
validateExample(example, 0, { route: {}, name: 'mockService' }),
).not.to.throw(Error)
})
})
@ -66,7 +66,7 @@ describe('validateExample function', function () {
invalidExamples.forEach(example => {
expect(() =>
validateExample(example, 0, { route: {}, name: 'mockService' })
validateExample(example, 0, { route: {}, name: 'mockService' }),
).to.throw(Error)
})
})
@ -93,7 +93,7 @@ test(transformExample, function () {
keywords: ['hello'],
},
0,
ExampleService
ExampleService,
).expect({
title: 'ExampleService',
example: {
@ -119,7 +119,7 @@ test(transformExample, function () {
keywords: ['hello'],
},
0,
ExampleService
ExampleService,
).expect({
title: 'ExampleService',
example: {
@ -146,7 +146,7 @@ test(transformExample, function () {
keywords: ['hello'],
},
0,
ExampleService
ExampleService,
).expect({
title: 'ExampleService',
example: {

16
core/base-service/got.spec.js
View File

@ -21,7 +21,7 @@ describe('got wrapper', function () {
.reply(200, 'x'.repeat(101))
const sendRequest = _fetchFactory(100)
return expect(
sendRequest('https://www.google.com/foo/bar')
sendRequest('https://www.google.com/foo/bar'),
).to.be.rejectedWith(InvalidResponse, 'Maximum response size exceeded')
})
@ -29,7 +29,7 @@ describe('got wrapper', function () {
nock('https://www.google.com').get('/foo/bar').replyWithError('oh no')
const sendRequest = _fetchFactory(1024)
return expect(
sendRequest('https://www.google.com/foo/bar')
sendRequest('https://www.google.com/foo/bar'),
).to.be.rejectedWith(Inaccessible, 'oh no')
})
@ -38,10 +38,10 @@ describe('got wrapper', function () {
nock.disableNetConnect()
const sendRequest = _fetchFactory(1024)
return expect(
sendRequest('https://www.google.com/foo/bar')
sendRequest('https://www.google.com/foo/bar'),
).to.be.rejectedWith(
Inaccessible,
'Nock: Disallowed net connect for "www.google.com:443/foo/bar"'
'Nock: Disallowed net connect for "www.google.com:443/foo/bar"',
)
})
@ -57,18 +57,18 @@ describe('got wrapper', function () {
prettyMessage: 'Oh no! A terrible thing has happened',
cacheSeconds: 10,
},
}
)
},
),
)
.to.be.rejectedWith(
Inaccessible,
"Inaccessible: Timeout awaiting 'request' for 1ms"
"Inaccessible: Timeout awaiting 'request' for 1ms",
)
// eslint-disable-next-line promise/prefer-await-to-then
.then(error => {
expect(error).to.have.property(
'prettyMessage',
'Oh no! A terrible thing has happened'
'Oh no! A terrible thing has happened',
)
expect(error).to.have.property('cacheSeconds', 10)
})

38
core/base-service/graphql.spec.js
View File

@ -9,18 +9,16 @@ describe('mergeQueries function', function () {
it('merges valid gql queries', function () {
expect(
print(
mergeQueries(
gql`
query ($param: String!) {
foo(param: $param) {
bar
}
mergeQueries(gql`
query ($param: String!) {
foo(param: $param) {
bar
}
`
)
)
}
`),
),
).to.equalIgnoreSpaces(
'query ($param: String!) { foo(param: $param) { bar } }'
'query ($param: String!) { foo(param: $param) { bar } }',
)
expect(
@ -37,11 +35,11 @@ describe('mergeQueries function', function () {
query {
baz
}
`
)
)
`,
),
),
).to.equalIgnoreSpaces(
'query ($param: String!) { foo(param: $param) { bar } baz }'
'query ($param: String!) { foo(param: $param) { bar } baz }',
)
expect(
@ -61,9 +59,9 @@ describe('mergeQueries function', function () {
query {
baz
}
`
)
)
`,
),
),
).to.equalIgnoreSpaces('{ foo bar baz }')
expect(
@ -78,9 +76,9 @@ describe('mergeQueries function', function () {
{
bar
}
`
)
)
`,
),
),
).to.equalIgnoreSpaces('{ foo bar }')
})

4
core/base-service/legacy-request-handler.js
View File

@ -104,7 +104,7 @@ function handleRequest(cacheHeaderConfig, handlerOptions) {
const badgeData = coalesceBadge(
filteredQueryParams,
{ label: 'vendor', message: 'unresponsive' },
{}
{},
)
const svg = makeBadge(badgeData)
const extension = (match.slice(-1)[0] || '.svg').replace(/^\./, '')
@ -126,7 +126,7 @@ function handleRequest(cacheHeaderConfig, handlerOptions) {
const svg = makeBadge(badgeData)
setCacheHeadersOnResponse(ask.res, badgeData.cacheLengthSeconds)
makeSend(format, ask.res, end)(svg)
}
},
)
// eslint-disable-next-line promise/prefer-await-to-then
if (result && result.catch) {

42
core/base-service/legacy-request-handler.spec.js
View File

@ -18,7 +18,7 @@ function fakeHandler(queryParams, match, sendBadge, request) {
label: 'testing',
message: someValue,
},
{}
{},
)
sendBadge(format, badgeData)
}
@ -35,7 +35,7 @@ function createFakeHandlerWithCacheLength(cacheLengthSeconds) {
{},
{
_cacheLength: cacheLengthSeconds,
}
},
)
sendBadge(format, badgeData)
}
@ -66,7 +66,7 @@ describe('The request handler', function () {
beforeEach(function () {
camp.route(
/^\/testing\/([^/]+)\.(svg|png|gif|jpg|json)$/,
handleRequest(standardCacheHeaders, { handler: fakeHandler })
handleRequest(standardCacheHeaders, { handler: fakeHandler }),
)
})
@ -90,7 +90,7 @@ describe('The request handler', function () {
beforeEach(function () {
camp.route(
/^\/testing\/([^/]+)\.(svg|png|gif|jpg|json)$/,
handleRequest(standardCacheHeaders, fakeHandler)
handleRequest(standardCacheHeaders, fakeHandler),
)
})
@ -119,8 +119,8 @@ describe('The request handler', function () {
cacheHeaderConfig,
(queryParams, match, sendBadge, request) => {
fakeHandler(queryParams, match, sendBadge, request)
}
)
},
),
)
}
@ -128,7 +128,7 @@ describe('The request handler', function () {
register({ cacheHeaderConfig: { defaultCacheLengthSeconds: 900 } })
const { headers } = await got(`${baseUrl}/testing/123.json`)
const expectedExpiry = new Date(
+new Date(headers.date) + 900000
+new Date(headers.date) + 900000,
).toGMTString()
expect(headers.expires).to.equal(expectedExpiry)
expect(headers['cache-control']).to.equal('max-age=900, s-maxage=900')
@ -142,7 +142,7 @@ describe('The request handler', function () {
const { headers } = await got(`${baseUrl}/testing/123.json`)
const expectedExpiry = new Date(
+new Date(headers.date) + 900000
+new Date(headers.date) + 900000,
).toGMTString()
expect(headers.expires).to.equal(expectedExpiry)
expect(headers['cache-control']).to.equal('max-age=900, s-maxage=900')
@ -158,10 +158,10 @@ describe('The request handler', function () {
queryParams,
match,
sendBadge,
request
request,
)
}
)
},
),
)
const { headers } = await got(`${baseUrl}/testing/123.json`)
@ -178,10 +178,10 @@ describe('The request handler', function () {
queryParams,
match,
sendBadge,
request
request,
)
}
)
},
),
)
const { headers } = await got(`${baseUrl}/testing/123.json`)
@ -191,10 +191,10 @@ describe('The request handler', function () {
it('should set the expires header to current time + cacheSeconds', async function () {
register({ cacheHeaderConfig: { defaultCacheLengthSeconds: 0 } })
const { headers } = await got(
`${baseUrl}/testing/123.json?cacheSeconds=3600`
`${baseUrl}/testing/123.json?cacheSeconds=3600`,
)
const expectedExpiry = new Date(
+new Date(headers.date) + 3600000
+new Date(headers.date) + 3600000,
).toGMTString()
expect(headers.expires).to.equal(expectedExpiry)
expect(headers['cache-control']).to.equal('max-age=3600, s-maxage=3600')
@ -203,10 +203,10 @@ describe('The request handler', function () {
it('should ignore cacheSeconds when shorter than defaultCacheLengthSeconds', async function () {
register({ cacheHeaderConfig: { defaultCacheLengthSeconds: 600 } })
const { headers } = await got(
`${baseUrl}/testing/123.json?cacheSeconds=300`
`${baseUrl}/testing/123.json?cacheSeconds=300`,
)
const expectedExpiry = new Date(
+new Date(headers.date) + 600000
+new Date(headers.date) + 600000,
).toGMTString()
expect(headers.expires).to.equal(expectedExpiry)
expect(headers['cache-control']).to.equal('max-age=600, s-maxage=600')
@ -217,7 +217,7 @@ describe('The request handler', function () {
const { headers } = await got(`${baseUrl}/testing/123.json`)
expect(headers.expires).to.equal(headers.date)
expect(headers['cache-control']).to.equal(
'no-cache, no-store, must-revalidate'
'no-cache, no-store, must-revalidate',
)
})
})
@ -234,7 +234,7 @@ describe('The request handler', function () {
++handlerCallCount
fakeHandler(queryParams, match, sendBadge, request)
},
})
}),
)
})
@ -242,7 +242,7 @@ describe('The request handler', function () {
await performTwoRequests(
baseUrl,
'/testing/123.svg?foo=1',
'/testing/123.svg?foo=2'
'/testing/123.svg?foo=2',
)
expect(handlerCallCount).to.equal(2)
})

16
core/base-service/loader.js
View File

@ -10,7 +10,7 @@ const serviceDir = path.join(
path.dirname(fileURLToPath(import.meta.url)),
'..',
'..',
'services'
'services',
)
function toUnixPath(path) {
@ -51,14 +51,14 @@ async function loadServiceClasses(servicePaths) {
const serviceClasses = []
for await (const servicePath of servicePaths) {
const currentServiceClasses = Object.values(
await import(`file://${servicePath}`)
await import(`file://${servicePath}`),
).flatMap(element =>
typeof element === 'object' ? Object.values(element) : element
typeof element === 'object' ? Object.values(element) : element,
)
if (currentServiceClasses.length === 0) {
throw new InvalidService(
`Expected ${servicePath} to export a service or a collection of services`
`Expected ${servicePath} to export a service or a collection of services`,
)
}
currentServiceClasses.forEach(serviceClass => {
@ -71,7 +71,7 @@ async function loadServiceClasses(servicePaths) {
return serviceClasses.push(serviceClass)
}
throw new InvalidService(
`Expected ${servicePath} to export a service or a collection of services; one of them was ${serviceClass}`
`Expected ${servicePath} to export a service or a collection of services; one of them was ${serviceClass}`,
)
})
}
@ -80,7 +80,7 @@ async function loadServiceClasses(servicePaths) {
serviceClasses.map(({ name }) => name),
{
message: 'Duplicate service names found',
}
},
)
return serviceClasses
@ -102,8 +102,8 @@ async function collectDefinitions() {
async function loadTesters() {
return Promise.all(
getServicePaths('*.tester.js').map(
async path => await import(`file://${path}`)
)
async path => await import(`file://${path}`),
),
)
}

28
core/base-service/loader.spec.js
View File

@ -12,50 +12,56 @@ chai.use(chaiAsPromised)
const { expect } = chai
const fixturesDir = path.join(
path.dirname(fileURLToPath(import.meta.url)),
'loader-test-fixtures'
'loader-test-fixtures',
)
describe('loadServiceClasses function', function () {
it('throws if module exports empty', async function () {
await expect(
loadServiceClasses([path.join(fixturesDir, 'empty-undefined.fixture.js')])
loadServiceClasses([
path.join(fixturesDir, 'empty-undefined.fixture.js'),
]),
).to.be.rejectedWith(InvalidService)
await expect(
loadServiceClasses([path.join(fixturesDir, 'empty-array.fixture.js')])
loadServiceClasses([path.join(fixturesDir, 'empty-array.fixture.js')]),
).to.be.rejectedWith(InvalidService)
await expect(
loadServiceClasses([path.join(fixturesDir, 'empty-object.fixture.js')])
loadServiceClasses([path.join(fixturesDir, 'empty-object.fixture.js')]),
).to.be.rejectedWith(InvalidService)
await expect(
loadServiceClasses([path.join(fixturesDir, 'empty-no-export.fixture.js')])
loadServiceClasses([
path.join(fixturesDir, 'empty-no-export.fixture.js'),
]),
).to.be.rejectedWith(InvalidService)
await expect(
loadServiceClasses([
path.join(fixturesDir, 'valid-array.fixture.js'),
path.join(fixturesDir, 'valid-class.fixture.js'),
path.join(fixturesDir, 'empty-array.fixture.js'),
])
]),
).to.be.rejectedWith(InvalidService)
})
it('throws if module exports invalid', async function () {
await expect(
loadServiceClasses([path.join(fixturesDir, 'invalid-no-base.fixture.js')])
loadServiceClasses([
path.join(fixturesDir, 'invalid-no-base.fixture.js'),
]),
).to.be.rejectedWith(InvalidService)
await expect(
loadServiceClasses([
path.join(fixturesDir, 'invalid-wrong-base.fixture.js'),
])
]),
).to.be.rejectedWith(InvalidService)
await expect(
loadServiceClasses([path.join(fixturesDir, 'invalid-mixed.fixture.js')])
loadServiceClasses([path.join(fixturesDir, 'invalid-mixed.fixture.js')]),
).to.be.rejectedWith(InvalidService)
await expect(
loadServiceClasses([
path.join(fixturesDir, 'valid-array.fixture.js'),
path.join(fixturesDir, 'valid-class.fixture.js'),
path.join(fixturesDir, 'invalid-no-base.fixture.js'),
])
]),
).to.be.rejectedWith(InvalidService)
})
@ -65,7 +71,7 @@ describe('loadServiceClasses function', function () {
path.join(fixturesDir, 'valid-array.fixture.js'),
path.join(fixturesDir, 'valid-object.fixture.js'),
path.join(fixturesDir, 'valid-class.fixture.js'),
])
]),
).to.eventually.have.length(5)
})
})

6
core/base-service/openapi.js
View File

@ -158,7 +158,7 @@ function examples2openapi(examples) {
const parameters = [
...pathParams,
...Object.entries(queryParams).map(([paramName, exampleValue]) =>
param2openapi(pattern, paramName, exampleValue, 'query')
param2openapi(pattern, paramName, exampleValue, 'query'),
),
...globalParamRefs,
]
@ -198,7 +198,7 @@ function services2openapi(services) {
if (service.openApi) {
// if the service declares its own OpenAPI definition, use that...
for (const [key, value] of Object.entries(
addGlobalProperties(service.openApi)
addGlobalProperties(service.openApi),
)) {
if (key in paths) {
throw new Error(`Conflicting route: ${key}`)
@ -208,7 +208,7 @@ function services2openapi(services) {
} else {
// ...otherwise do our best to build one from examples[]
for (const [key, value] of Object.entries(
examples2openapi(service.examples)
examples2openapi(service.examples),
)) {
// allow conflicting routes for legacy examples
paths[key] = value

4
core/base-service/openapi.spec.js
View File

@ -371,8 +371,8 @@ describe('category2openapi', function () {
category2openapi({ name: 'build' }, [
OpenApiService.getDefinition(),
LegacyService.getDefinition(),
])
)
]),
),
).to.deep.equal(expected)
})
})

4
core/base-service/redirector.js
View File

@ -23,7 +23,7 @@ const attrSchema = Joi.object({
.required()
.error(
() =>
'"transformPath" must be a function that transforms named params to a new path'
'"transformPath" must be a function that transforms named params to a new path',
),
transformQueryParams: Joi.func().arity(1),
dateAdded: Joi.date().required(),
@ -80,7 +80,7 @@ export default function redirector(attrs) {
'inbound',
emojic.arrowHeadingUp,
'Redirector',
route.base
route.base,
)
trace.logTrace('inbound', emojic.ticket, 'Named params', namedParams)
trace.logTrace('inbound', emojic.crayon, 'Query params', queryParams)

36
core/base-service/redirector.spec.js
View File

@ -27,7 +27,7 @@ describe('Redirector', function () {
redirector({
...attrs,
name: 'ShinyRedirect',
}).name
}).name,
).to.equal('ShinyRedirect')
})
@ -41,7 +41,7 @@ describe('Redirector', function () {
it('throws the expected error when dateAdded is missing', function () {
expect(() =>
redirector({ route, category, transformPath }).validateDefinition()
redirector({ route, category, transformPath }).validateDefinition(),
).to.throw('"dateAdded" is required')
})
@ -93,7 +93,7 @@ describe('Redirector', function () {
})
ServiceClass.register(
{ camp },
{ rasterUrl: 'http://raster.example.test' }
{ rasterUrl: 'http://raster.example.test' },
)
})
@ -102,7 +102,7 @@ describe('Redirector', function () {
`${baseUrl}/very/old/service/hello-world.svg`,
{
followRedirect: false,
}
},
)
expect(statusCode).to.equal(301)
@ -114,12 +114,12 @@ describe('Redirector', function () {
`${baseUrl}/very/old/service/hello-world.png`,
{
followRedirect: false,
}
},
)
expect(statusCode).to.equal(301)
expect(headers.location).to.equal(
'http://raster.example.test/new/service/hello-world.png'
'http://raster.example.test/new/service/hello-world.png',
)
})
@ -128,12 +128,12 @@ describe('Redirector', function () {
`${baseUrl}/very/old/service/hello-world.svg?color=123&style=flat-square`,
{
followRedirect: false,
}
},
)
expect(statusCode).to.equal(301)
expect(headers.location).to.equal(
'/new/service/hello-world.svg?color=123&style=flat-square'
'/new/service/hello-world.svg?color=123&style=flat-square',
)
})
@ -142,12 +142,12 @@ describe('Redirector', function () {
`${baseUrl}/very/old/service/hello%0Dworld.svg?foobar=a%0Db`,
{
followRedirect: false,
}
},
)
expect(statusCode).to.equal(301)
expect(headers.location).to.equal(
'/new/service/hello%0Dworld.svg?foobar=a%0Db'
'/new/service/hello%0Dworld.svg?foobar=a%0Db',
)
})
@ -174,12 +174,12 @@ describe('Redirector', function () {
`${baseUrl}/another/old/service/token/abc123/hello-world.svg`,
{
followRedirect: false,
}
},
)
expect(statusCode).to.equal(301)
expect(headers.location).to.equal(
'/new/service/hello-world.svg?token=abc123'
'/new/service/hello-world.svg?token=abc123',
)
})
@ -188,12 +188,12 @@ describe('Redirector', function () {
`${baseUrl}/another/old/service/token/abc123/hello-world.svg?color=123&style=flat-square`,
{
followRedirect: false,
}
},
)
expect(statusCode).to.equal(301)
expect(headers.location).to.equal(
'/new/service/hello-world.svg?color=123&style=flat-square&token=abc123'
'/new/service/hello-world.svg?color=123&style=flat-square&token=abc123',
)
})
@ -202,12 +202,12 @@ describe('Redirector', function () {
`${baseUrl}/another/old/service/token/abc123/hello-world.svg?color=123&style=flat-square&token=def456`,
{
followRedirect: false,
}
},
)
expect(statusCode).to.equal(301)
expect(headers.location).to.equal(
'/new/service/hello-world.svg?color=123&style=flat-square&token=abc123'
'/new/service/hello-world.svg?color=123&style=flat-square&token=abc123',
)
})
@ -229,12 +229,12 @@ describe('Redirector', function () {
`${baseUrl}/override/service/token/abc123/hello-world.svg?style=flat-square&token=def456`,
{
followRedirect: false,
}
},
)
expect(statusCode).to.equal(301)
expect(headers.location).to.equal(
'/new/service/hello-world.svg?style=flat-square&token=def456'
'/new/service/hello-world.svg?style=flat-square&token=def456',
)
})
})

2
core/base-service/resource-cache.js
View File

@ -40,7 +40,7 @@ async function getCachedResource({
}
const { buffer } = await checkErrorResponse({})(
await requestFetcher(url, options)
await requestFetcher(url, options),
)
let reqData

2
core/base-service/route.js
View File

@ -52,7 +52,7 @@ function namedParamsForMatch(captureNames = [], match, ServiceClass) {
if (captureNames.length !== captures.length) {
throw new Error(
`Service ${ServiceClass.name} declares incorrect number of named params ` +
`(expected ${captures.length}, got ${captureNames.length})`
`(expected ${captures.length}, got ${captureNames.length})`,
)
}

8
core/base-service/route.spec.js
View File

@ -86,9 +86,9 @@ describe('Route helpers', function () {
expect(() =>
namedParamsForMatch(captureNames, regex.exec('/foo/bar/baz.svg'), {
name: 'MyService',
})
}),
).to.throw(
'Service MyService declares incorrect number of named params (expected 2, got 1)'
'Service MyService declares incorrect number of named params (expected 2, got 1)',
)
})
@ -96,14 +96,14 @@ describe('Route helpers', function () {
expect(
getQueryParamNames({
queryParamSchema: Joi.object({ foo: Joi.string() }).required(),
})
}),
).to.deep.equal(['foo'])
expect(
getQueryParamNames({
queryParamSchema: Joi.object({ foo: Joi.string() })
.rename('bar', 'foo', { ignoreUndefined: true, override: true })
.required(),
})
}),
).to.deep.equal(['foo', 'bar'])
})
})

10
core/base-service/service-definitions.js
View File

@ -18,7 +18,7 @@ const serviceDefinition = Joi.object({
Joi.object({
format: Joi.string().required(),
queryParams: arrayOfStrings,
})
}),
),
examples: Joi.array()
.items(
@ -40,7 +40,7 @@ const serviceDefinition = Joi.object({
documentation: Joi.object({
__html: Joi.string().required(), // Valid HTML.
}),
})
}),
)
.default([]),
openApi: Joi.object().pattern(
@ -58,12 +58,12 @@ const serviceDefinition = Joi.object({
required: Joi.boolean().required(),
schema: Joi.object({ type: Joi.string().required() }).required(),
example: Joi.string(),
})
}),
)
.min(1)
.required(),
}).required(),
}).required()
}).required(),
),
}).required()
@ -79,7 +79,7 @@ const serviceDefinitionExport = Joi.object({
id: Joi.string().required(),
name: Joi.string().required(),
keywords: arrayOfStrings,
})
}),
)
.required(),
services: Joi.array().items(serviceDefinition).required(),

4
core/base-service/validate.js
View File

@ -12,7 +12,7 @@ function validate(
allowAndStripUnknownKeys = true,
},
data,
schema
schema,
) {
if (!schema || !Joi.isSchema(schema)) {
throw Error('A Joi schema is required')
@ -28,7 +28,7 @@ function validate(
'validate',
emojic.womanShrugging,
traceErrorMessage,
error.message
error.message,
)
let prettyMessage = prettyErrorMessage

18
core/base-service/validate.spec.js
View File

@ -49,7 +49,7 @@ describe('validate', function () {
sinon.match.string,
traceSuccessMessage,
{ requiredString: 'bar' },
{ deep: true }
{ deep: true },
)
})
})
@ -60,13 +60,13 @@ describe('validate', function () {
validate(
options,
{ requiredString: ['this', "shouldn't", 'work'] },
schema
schema,
)
expect.fail('Expected to throw')
} catch (e) {
expect(e).to.be.an.instanceof(InvalidParameter)
expect(e.message).to.equal(
'Invalid Parameter: "requiredString" must be a string'
'Invalid Parameter: "requiredString" must be a string',
)
expect(e.prettyMessage).to.equal(prettyErrorMessage)
}
@ -74,7 +74,7 @@ describe('validate', function () {
'validate',
sinon.match.string,
traceErrorMessage,
'"requiredString" must be a string'
'"requiredString" must be a string',
)
})
@ -86,16 +86,16 @@ describe('validate', function () {
{
requiredString: ['this', "shouldn't", 'work'],
},
schema
schema,
)
expect.fail('Expected to throw')
} catch (e) {
expect(e).to.be.an.instanceof(InvalidParameter)
expect(e.message).to.equal(
'Invalid Parameter: "requiredString" must be a string'
'Invalid Parameter: "requiredString" must be a string',
)
expect(e.prettyMessage).to.equal(
`${prettyErrorMessage}: requiredString`
`${prettyErrorMessage}: requiredString`,
)
}
})
@ -107,13 +107,13 @@ describe('validate', function () {
validate(
{ ...options, allowAndStripUnknownKeys: false, includeKeys: true },
{ requiredString: 'bar', extra: 'nonsense', more: 'bogus' },
schema
schema,
)
expect.fail('Expected to throw')
} catch (e) {
expect(e).to.be.an.instanceof(InvalidParameter)
expect(e.message).to.equal(
'Invalid Parameter: "extra" is not allowed. "more" is not allowed'
'Invalid Parameter: "extra" is not allowed. "more" is not allowed',
)
expect(e.prettyMessage).to.equal(`${prettyErrorMessage}: extra, more`)
}

10
core/server/influx-metrics.js
View File

@ -27,14 +27,16 @@ export default class InfluxMetrics {
response = await got.post(request)
} catch (error) {
log.error(
new Error(`Cannot push metrics. Cause: ${error.name}: ${error.message}`)
new Error(
`Cannot push metrics. Cause: ${error.name}: ${error.message}`,
),
)
}
if (response && response.statusCode >= 300) {
log.error(
new Error(
`Cannot push metrics. ${request.url} responded with status code ${response.statusCode}`
)
`Cannot push metrics. ${request.url} responded with status code ${response.statusCode}`,
),
)
}
}
@ -42,7 +44,7 @@ export default class InfluxMetrics {
startPushingMetrics() {
this._intervalId = setInterval(
() => this.sendMetrics(),
this._config.intervalSeconds * 1000
this._config.intervalSeconds * 1000,
)
}

20
core/server/influx-metrics.spec.js
View File

@ -47,7 +47,7 @@ describe('Influx metrics', function () {
const influxMetrics = new InfluxMetrics(metricInstance, customConfig)
expect(await influxMetrics.metrics()).to.be.contain(
'instance=test-hostname'
'instance=test-hostname',
)
})
@ -69,7 +69,7 @@ describe('Influx metrics', function () {
const influxMetrics = new InfluxMetrics(metricInstance, customConfig)
expect(await influxMetrics.metrics()).to.be.contain(
'instance=test-hostname-alias'
'instance=test-hostname-alias',
)
})
})
@ -96,7 +96,7 @@ describe('Influx metrics', function () {
.persist()
.post(
'/metrics',
'prometheus,application=shields,env=test-env,instance=instance2 counter1=11'
'prometheus,application=shields,env=test-env,instance=instance2 counter1=11',
)
.basicAuth({ user: 'metrics-username', pass: 'metrics-password' })
.reply(200)
@ -117,7 +117,7 @@ describe('Influx metrics', function () {
await clock.tickAsync(10)
expect(scope.isDone()).to.be.equal(
true,
`pending mocks: ${scope.pendingMocks()}`
`pending mocks: ${scope.pendingMocks()}`,
)
})
})
@ -150,9 +150,9 @@ describe('Influx metrics', function () {
.and(
sinon.match.has(
'message',
'Cannot push metrics. Cause: RequestError: Nock: Disallowed net connect for "shields-metrics.io:443/metrics"'
)
)
'Cannot push metrics. Cause: RequestError: Nock: Disallowed net connect for "shields-metrics.io:443/metrics"',
),
),
)
})
@ -167,9 +167,9 @@ describe('Influx metrics', function () {
.and(
sinon.match.has(
'message',
'Cannot push metrics. https://shields-metrics.io/metrics responded with status code 400'
)
)
'Cannot push metrics. https://shields-metrics.io/metrics responded with status code 400',
),
),
)
})
})

2
core/server/metrics/format-converters.js
View File

@ -4,7 +4,7 @@ function promClientJsonToInfluxV2(metrics, extraLabels = {}) {
return metrics
.flatMap(metric => {
const valuesByLabels = groupBy(metric.values, value =>
JSON.stringify(Object.entries(value.labels).sort())
JSON.stringify(Object.entries(value.labels).sort()),
)
return Object.values(valuesByLabels).map(metricsWithSameLabel => {
const labels = Object.entries(metricsWithSameLabel[0].labels)

10
core/server/metrics/format-converters.spec.js
View File

@ -95,7 +95,7 @@ describe('Metric format converters', function () {
prometheus,le=50 histogram1_bucket=2
prometheus,le=15 histogram1_bucket=2
prometheus,le=5 histogram1_bucket=1
prometheus histogram1_count=3,histogram1_sum=111`)
prometheus histogram1_count=3,histogram1_sum=111`),
)
})
@ -118,7 +118,7 @@ prometheus histogram1_count=3,histogram1_sum=111`)
prometheus,le=50 histogram1_bucket=2
prometheus,le=15 histogram1_bucket=2
prometheus,le=5 histogram1_bucket=1
prometheus histogram1_count=3,histogram1_sum=111`)
prometheus histogram1_count=3,histogram1_sum=111`),
)
})
@ -145,7 +145,7 @@ prometheus histogram1_count=3,histogram1_sum=111`)
sortLines(`prometheus,quantile=0.99 summary1=100
prometheus,quantile=0.9 summary1=100
prometheus,quantile=0.1 summary1=1
prometheus summary1_count=3,summary1_sum=111`)
prometheus summary1_count=3,summary1_sum=111`),
)
})
@ -167,7 +167,7 @@ prometheus summary1_count=3,summary1_sum=111`)
sortLines(`prometheus,quantile=0.99 summary1=100
prometheus,quantile=0.9 summary1=100
prometheus,quantile=0.1 summary1=1
prometheus summary1_count=3,summary1_sum=111`)
prometheus summary1_count=3,summary1_sum=111`),
)
})
@ -204,7 +204,7 @@ prometheus summary1_count=3,summary1_sum=111`)
})
expect(influx).to.be.equal(
'prometheus,env=production,instance=instance1 counter1=11'
'prometheus,env=production,instance=instance1 counter1=11',
)
})
})

2
core/server/prometheus-metrics.js
View File

@ -79,7 +79,7 @@ export default class PrometheusMetrics {
return this.counters.serviceResponseSize.labels(
category,
serviceFamily,
service
service,
)
}
}

36
core/server/server.js
View File

@ -65,11 +65,11 @@ const publicConfigSchema = Joi.object({
bind: {
port: Joi.alternatives().try(
Joi.number().port(),
Joi.string().pattern(/^\\\\\.\\pipe\\.+$/)
Joi.string().pattern(/^\\\\\.\\pipe\\.+$/),
),
address: Joi.alternatives().try(
Joi.string().ip().required(),
Joi.string().hostname().required()
Joi.string().hostname().required(),
),
},
metrics: {
@ -154,8 +154,8 @@ const publicConfigSchema = Joi.object({
path.dirname(fileURLToPath(import.meta.url)),
'..',
'..',
'public'
)
'public',
),
),
requireCloudflare: Joi.boolean().required(),
}).required()
@ -236,7 +236,7 @@ class Server {
const publicConfig = Joi.attempt(config.public, publicConfigSchema)
const privateConfig = this.validatePrivateConfig(
config.private,
privateConfigSchema
privateConfigSchema,
)
// We want to require an username and a password for the influx metrics
// only if the influx metrics are enabled. The private config schema
@ -245,7 +245,7 @@ class Server {
if (publicConfig.metrics.influx && publicConfig.metrics.influx.enabled) {
this.validatePrivateConfig(
config.private,
privateMetricsInfluxConfigSchema
privateMetricsInfluxConfigSchema,
)
}
this.config = {
@ -270,7 +270,7 @@ class Server {
Object.assign({}, publicConfig.metrics.influx, {
username: privateConfig.influx_username,
password: privateConfig.influx_password,
})
}),
)
}
}
@ -283,8 +283,8 @@ class Server {
const badPaths = e.details.map(({ path }) => path)
throw Error(
`Private configuration is invalid. Check these paths: ${badPaths.join(
','
)}`
',',
)}`,
)
}
}
@ -350,14 +350,14 @@ class Server {
makeSend(
'svg',
request.res,
end
end,
)(
makeBadge({
label: '410',
message: `${format} no longer available`,
color: 'lightgray',
format: 'svg',
})
}),
)
})
@ -366,14 +366,14 @@ class Server {
makeSend(
'svg',
request.res,
end
end,
)(
makeBadge({
label: '404',
message: 'raster badges not available',
color: 'lightgray',
format: 'svg',
})
}),
)
})
}
@ -385,14 +385,14 @@ class Server {
makeSend(
format,
request.res,
end
end,
)(
makeBadge({
label: '404',
message: 'badge not found',
color: 'red',
format,
})
}),
)
})
}
@ -416,7 +416,7 @@ class Server {
ask.res.statusCode = 301
ask.res.setHeader(
'Location',
rasterRedirectUrl({ rasterUrl }, ask.req.url)
rasterRedirectUrl({ rasterUrl }, ask.req.url),
)
const cacheDuration = (30 * 24 * 3600) | 0 // 30 days.
@ -459,8 +459,8 @@ class Server {
rasterUrl: config.public.rasterUrl,
private: config.private,
public: config.public,
}
)
},
),
)
}

50
core/server/server.spec.js
View File

@ -19,7 +19,7 @@ describe('The server', function () {
public: {
documentRoot: path.resolve(
path.dirname(fileURLToPath(import.meta.url)),
'test-public'
'test-public',
),
},
})
@ -66,7 +66,7 @@ describe('The server', function () {
it('should return cors header for the request', async function () {
const { statusCode, headers } = await got(
`${baseUrl}badge/foo-bar-blue.svg`
`${baseUrl}badge/foo-bar-blue.svg`,
)
expect(statusCode).to.equal(200)
expect(headers['access-control-allow-origin']).to.equal('*')
@ -77,11 +77,11 @@ describe('The server', function () {
`${baseUrl}:fruit-apple-green.png`,
{
followRedirect: false,
}
},
)
expect(statusCode).to.equal(301)
expect(headers.location).to.equal(
'http://raster.example.test/:fruit-apple-green.png'
'http://raster.example.test/:fruit-apple-green.png',
)
})
@ -90,11 +90,11 @@ describe('The server', function () {
`${baseUrl}badge/foo-bar-blue.png`,
{
followRedirect: false,
}
},
)
expect(statusCode).to.equal(301)
expect(headers.location).to.equal(
'http://raster.example.test/badge/foo-bar-blue.png'
'http://raster.example.test/badge/foo-bar-blue.png',
)
})
@ -105,7 +105,7 @@ describe('The server', function () {
it('should produce SVG badges with expected headers', async function () {
const { statusCode, headers } = await got(
`${baseUrl}:fruit-apple-green.svg`
`${baseUrl}:fruit-apple-green.svg`,
)
expect(statusCode).to.equal(200)
expect(headers['content-type']).to.equal('image/svg+xml;charset=utf-8')
@ -119,7 +119,7 @@ describe('The server', function () {
it('should produce JSON badges with expected headers', async function () {
const { statusCode, body, headers } = await got(
`${baseUrl}:fruit-apple-green.json`
`${baseUrl}:fruit-apple-green.json`,
)
expect(statusCode).to.equal(200)
expect(headers['content-type']).to.equal('application/json')
@ -137,7 +137,7 @@ describe('The server', function () {
// https://github.com/badges/shields/pull/1319
it('should not crash with a numeric logo', async function () {
const { statusCode, body } = await got(
`${baseUrl}:fruit-apple-green.svg?logo=1`
`${baseUrl}:fruit-apple-green.svg?logo=1`,
)
expect(statusCode).to.equal(200)
expect(body)
@ -148,7 +148,7 @@ describe('The server', function () {
it('should not crash with a numeric link', async function () {
const { statusCode, body } = await got(
`${baseUrl}:fruit-apple-green.svg?link=1`
`${baseUrl}:fruit-apple-green.svg?link=1`,
)
expect(statusCode).to.equal(200)
expect(body)
@ -159,7 +159,7 @@ describe('The server', function () {
it('should not crash with a boolean link', async function () {
const { statusCode, body } = await got(
`${baseUrl}:fruit-apple-green.svg?link=true`
`${baseUrl}:fruit-apple-green.svg?link=true`,
)
expect(statusCode).to.equal(200)
expect(body)
@ -173,7 +173,7 @@ describe('The server', function () {
`${baseUrl}this/is/not/a/badge.svg`,
{
throwHttpErrors: false,
}
},
)
expect(statusCode).to.equal(404)
expect(body)
@ -187,7 +187,7 @@ describe('The server', function () {
`${baseUrl}this/is/most/definitely/not/a/badge.js`,
{
throwHttpErrors: false,
}
},
)
expect(statusCode).to.equal(404)
expect(body)
@ -211,7 +211,7 @@ describe('The server', function () {
`${baseUrl}badge/foo-bar-blue.jpg`,
{
throwHttpErrors: false,
}
},
)
// TODO It would be nice if this were 404 or 410.
expect(statusCode).to.equal(200)
@ -236,7 +236,7 @@ describe('The server', function () {
await server.start()
const { statusCode, body } = await got(
`${server.baseUrl}badge/foo-bar-blue.svg`
`${server.baseUrl}badge/foo-bar-blue.svg`,
)
expect(statusCode).to.be.equal(200)
@ -365,7 +365,7 @@ describe('The server', function () {
it('should require url when influx configuration is enabled', function () {
delete customConfig.public.metrics.influx.url
expect(() => new Server(customConfig)).to.throw(
'"metrics.influx.url" is required'
'"metrics.influx.url" is required',
)
})
@ -378,21 +378,21 @@ describe('The server', function () {
it('should require timeoutMilliseconds when influx configuration is enabled', function () {
delete customConfig.public.metrics.influx.timeoutMilliseconds
expect(() => new Server(customConfig)).to.throw(
'"metrics.influx.timeoutMilliseconds" is required'
'"metrics.influx.timeoutMilliseconds" is required',
)
})
it('should require intervalSeconds when influx configuration is enabled', function () {
delete customConfig.public.metrics.influx.intervalSeconds
expect(() => new Server(customConfig)).to.throw(
'"metrics.influx.intervalSeconds" is required'
'"metrics.influx.intervalSeconds" is required',
)
})
it('should require instanceIdFrom when influx configuration is enabled', function () {
delete customConfig.public.metrics.influx.instanceIdFrom
expect(() => new Server(customConfig)).to.throw(
'"metrics.influx.instanceIdFrom" is required'
'"metrics.influx.instanceIdFrom" is required',
)
})
@ -400,7 +400,7 @@ describe('The server', function () {
customConfig.public.metrics.influx.instanceIdFrom = 'env-var'
delete customConfig.public.metrics.influx.instanceIdEnvVarName
expect(() => new Server(customConfig)).to.throw(
'"metrics.influx.instanceIdEnvVarName" is required'
'"metrics.influx.instanceIdEnvVarName" is required',
)
})
@ -422,7 +422,7 @@ describe('The server', function () {
it('should require envLabel when influx configuration is enabled', function () {
delete customConfig.public.metrics.influx.envLabel
expect(() => new Server(customConfig)).to.throw(
'"metrics.influx.envLabel" is required'
'"metrics.influx.envLabel" is required',
)
})
@ -439,14 +439,14 @@ describe('The server', function () {
it('should require username when influx configuration is enabled', function () {
delete customConfig.private.influx_username
expect(() => new Server(customConfig)).to.throw(
'Private configuration is invalid. Check these paths: influx_username'
'Private configuration is invalid. Check these paths: influx_username',
)
})
it('should require password when influx configuration is enabled', function () {
delete customConfig.private.influx_password
expect(() => new Server(customConfig)).to.throw(
'Private configuration is invalid. Check these paths: influx_password'
'Private configuration is invalid. Check these paths: influx_password',
)
})
@ -505,7 +505,7 @@ describe('The server', function () {
})
.post(
'/metrics',
/prometheus,application=shields,category=static,env=localhost-env,family=static-badge,instance=test-instance,service=static_badge service_requests_total=1\n/
/prometheus,application=shields,category=static,env=localhost-env,family=static-badge,instance=test-instance,service=static_badge service_requests_total=1\n/,
)
.basicAuth({ user: 'influx-username', pass: 'influx-password' })
.reply(200)
@ -515,7 +515,7 @@ describe('The server', function () {
expect(scope.isDone()).to.be.equal(
true,
`pending mocks: ${scope.pendingMocks()}`
`pending mocks: ${scope.pendingMocks()}`,
)
})
})

4
core/service-test-runner/cli.js
View File

@ -121,8 +121,8 @@ if (typeof onlyServices === 'undefined' || onlyServices.includes('*****')) {
} else {
console.info(
`Running tests for ${onlyServices.length} services: ${onlyServices.join(
', '
)}.\n`
', ',
)}.\n`,
)
runner.only(onlyServices)
}

2
core/service-test-runner/create-service-tester.js
View File

@ -23,7 +23,7 @@ async function createServiceTester() {
const ServiceClass = Object.values(await import(servicePath))[0]
if (!(ServiceClass.prototype instanceof BaseService)) {
throw Error(
`${servicePath} does not export a single service. Invoke new ServiceTester() directly.`
`${servicePath} does not export a single service. Invoke new ServiceTester() directly.`,
)
}
return ServiceTester.forServiceClass(ServiceClass)

4
core/service-test-runner/icedfrisby-shields.js
View File

@ -91,11 +91,11 @@ const factory = superclass =>
Joi.attempt(
json[name],
Joi.string().regex(expected),
`${name} mismatch:`
`${name} mismatch:`,
)
} else {
throw new Error(
"'expected' must be a string, a number, a regex, an array or a Joi schema"
"'expected' must be a string, a number, a regex, an array or a Joi schema",
)
}
}

2
core/service-test-runner/runner.js
View File

@ -25,7 +25,7 @@ class Runner {
*/
async prepare() {
this.testers = (await loadTesters()).flatMap(testerModule =>
Object.values(testerModule)
Object.values(testerModule),
)
this.testers.forEach(tester => {
tester.beforeEach = () => {

2
core/service-test-runner/services-for-title.spec.js
View File

@ -10,7 +10,7 @@ describe('Services from PR title', function () {
])
given('[CRAN CPAN CTAN] Add test coverage').expect(['cran', 'cpan', 'ctan'])
given(
'[RFC] Add Joi-based request validation to BaseJsonService and rewrite [NPM] badges'
'[RFC] Add Joi-based request validation to BaseJsonService and rewrite [NPM] badges',
).expect(['npm'])
given('make changes to [CRAN] and [CPAN]').expect(['cran', 'cpan'])
given('[github appveyor ]').expect(['github', 'appveyor'])

8
core/token-pooling/sql-token-persistence.integration.js
View File

@ -36,7 +36,7 @@ describe('SQL token persistence', function () {
beforeEach('Create temporary table', async function () {
await pool.query(
`CREATE TEMPORARY TABLE ${tableName} (LIKE github_user_tokens INCLUDING ALL);`
`CREATE TEMPORARY TABLE ${tableName} (LIKE github_user_tokens INCLUDING ALL);`,
)
})
afterEach('Drop temporary table', async function () {
@ -57,7 +57,7 @@ describe('SQL token persistence', function () {
initialTokens.forEach(async token => {
await pool.query(
`INSERT INTO pg_temp.${tableName} (token) VALUES ($1::text);`,
[token]
[token],
)
})
})
@ -77,7 +77,7 @@ describe('SQL token persistence', function () {
await persistence.noteTokenAdded(newToken)
const result = await pool.query(
`SELECT token FROM pg_temp.${tableName};`
`SELECT token FROM pg_temp.${tableName};`,
)
const savedTokens = result.rows.map(row => row.token)
expect(savedTokens.sort()).to.deep.equal(expected)
@ -93,7 +93,7 @@ describe('SQL token persistence', function () {
await persistence.noteTokenRemoved(toRemove)
const result = await pool.query(
`SELECT token FROM pg_temp.${tableName};`
`SELECT token FROM pg_temp.${tableName};`,
)
const savedTokens = result.rows.map(row => row.token)
expect(savedTokens.sort()).to.deep.equal(expected)

4
core/token-pooling/sql-token-persistence.js
View File

@ -28,14 +28,14 @@ export default class SqlTokenPersistence {
async onTokenAdded(token) {
return await this.pool.query(
`INSERT INTO ${this.table} (token) VALUES ($1::text) ON CONFLICT (token) DO NOTHING;`,
[token]
[token],
)
}
async onTokenRemoved(token) {
return await this.pool.query(
`DELETE FROM ${this.table} WHERE token=$1::text;`,
[token]
[token],
)
}

6
core/token-pooling/token-pool.spec.js
View File

@ -21,16 +21,16 @@ describe('The token pool', function () {
it('should yield the expected tokens', function () {
ids.forEach(id =>
times(batchSize, () => expect(tokenPool.next().id).to.equal(id))
times(batchSize, () => expect(tokenPool.next().id).to.equal(id)),
)
})
it('should repeat when reaching the end', function () {
ids.forEach(id =>
times(batchSize, () => expect(tokenPool.next().id).to.equal(id))
times(batchSize, () => expect(tokenPool.next().id).to.equal(id)),
)
ids.forEach(id =>
times(batchSize, () => expect(tokenPool.next().id).to.equal(id))
times(batchSize, () => expect(tokenPool.next().id).to.equal(id)),
)
})

22
dangerfile.js
View File

@ -16,7 +16,7 @@ const { fileMatch } = danger.git
const documentation = fileMatch(
'**/*.md',
'frontend/docs/**',
'frontend/src/**'
'frontend/src/**',
)
const server = fileMatch('core/server/**.js', '!*.spec.js')
const serverTests = fileMatch('core/server/**.spec.js')
@ -33,7 +33,7 @@ message(
[
':sparkles: Thanks for your contribution to Shields, ',
`@${danger.github.pr.user.login}!`,
].join('')
].join(''),
)
const targetBranch = danger.github.pr.base.ref
@ -48,7 +48,7 @@ if (documentation.edited) {
[
'Thanks for contributing to our documentation. ',
'We :heart: our [documentarians](http://www.writethedocs.org/)!',
].join('')
].join(''),
)
}
@ -63,7 +63,7 @@ if (server.modified && !serverTests.modified) {
[
'This PR modified the server but none of its tests. <br>',
"That's okay so long as it's refactoring existing code.",
].join('')
].join(''),
)
}
@ -74,7 +74,7 @@ if (legacyHelpers.created) {
[
'This PR modified helper functions in `lib/` but not accompanying tests. <br>',
"That's okay so long as it's refactoring existing code.",
].join('')
].join(''),
)
}
@ -85,7 +85,7 @@ if (logos.created) {
'Please ensure your contribution follows our ',
'[guidance](https://github.com/badges/shields/blob/master/doc/logos.md#contributing-logos) ',
'for logo submissions.',
].join('')
].join(''),
)
}
@ -94,7 +94,7 @@ if (capitals.created || underscores.created) {
[
'JavaScript source files should be named with `kebab-case` ',
'(dash-separated lowercase).',
].join('')
].join(''),
)
}
@ -116,7 +116,7 @@ if (allFiles.length > 100) {
':books: Remember to ensure any changes to `config.private` ',
`in \`${file}\` are reflected in the [server secrets documentation]`,
'(https://github.com/badges/shields/blob/master/doc/server-secrets.md)',
].join('')
].join(''),
)
}
@ -126,7 +126,7 @@ if (allFiles.length > 100) {
`Found 'assert' statement added in \`${file}\`. <br>`,
'Please ensure tests are written using Chai ',
'[expect syntax](http://chaijs.com/guide/styles/#expect)',
].join('')
].join(''),
)
}
@ -135,7 +135,7 @@ if (allFiles.length > 100) {
[
`Found import of '@hapi/joi' in \`${file}\`. <br>`,
"Joi must be imported as 'joi'.",
].join('')
].join(''),
)
}
})
@ -168,7 +168,7 @@ affectedServices.forEach(service => {
[
`This PR modified service code for <kbd>${service}</kbd> but not its test code. <br>`,
"That's okay so long as it's refactoring existing code.",
].join('')
].join(''),
)
}
})

6
doc/service-tests.md
View File

@ -186,7 +186,7 @@ t.create('Build status (private application)')
.intercept(nock =>
nock('https://app.wercker.com/api/v3/applications/')
.get('/wercker/go-wercker-api/builds?limit=1')
.reply(401)
.reply(401),
)
.expectBadge({ label: 'build', message: 'private application not supported' })
```
@ -227,7 +227,7 @@ t.create('Build passed')
.intercept(nock =>
nock('https://app.wercker.com/api/v3/applications/')
.get('/wercker/go-wercker-api/builds?limit=1')
.reply(200, [{ status: 'finished', result: 'passed' }])
.reply(200, [{ status: 'finished', result: 'passed' }]),
)
.expectBadge({
label: 'build',
@ -240,7 +240,7 @@ t.create('Build failed')
.intercept(nock =>
nock('https://app.wercker.com/api/v3/applications/')
.get('/wercker/go-wercker-api/builds?limit=1')
.reply(200, [{ status: 'finished', result: 'failed' }])
.reply(200, [{ status: 'finished', result: 'failed' }]),
)
.expectBadge({ label: 'build', message: 'failed', color: 'red' })
```

2
entrypoint.spec.js
View File

@ -18,7 +18,7 @@ after('shut down the server', async function () {
it('should render a badge', async function () {
this.timeout('30s')
const { statusCode, body } = await got(
'http://localhost:1111/badge/fruit-apple-green.svg'
'http://localhost:1111/badge/fruit-apple-green.svg',
)
expect(statusCode).to.equal(200)
expect(body).to.satisfy(isSvg).and.to.include('fruit').and.to.include('apple')

6
frontend/src/theme/ApiDemoPanel/Curl/index.js
View File

@ -183,11 +183,11 @@ function Curl({ postman, codeSamples }) {
}
setCodeText(snippet)
}
},
)
} else if (language && !!language.source) {
setCodeText(
language.source.replace('$url', postmanRequest.url.toString())
language.source.replace('$url', postmanRequest.url.toString()),
)
} else {
setCodeText('')
@ -230,7 +230,7 @@ function Curl({ postman, codeSamples }) {
className={clsx(
language === lang ? styles.selected : undefined,
language === lang ? 'api-code-tab--active' : undefined,
'api-code-tab'
'api-code-tab',
)}
key={lang.tabName || lang.label}
onClick={() => setLanguage(lang)}

2
lib/load-logos.js
View File

@ -9,7 +9,7 @@ function loadLogos() {
const logoDir = path.join(
path.dirname(fileURLToPath(import.meta.url)),
'..',
'logo'
'logo',
)
const logoFiles = fs.readdirSync(logoDir)
logoFiles.forEach(filename => {

2
lib/load-simple-icons.spec.js
View File

@ -11,7 +11,7 @@ describe('loadSimpleIcons', function () {
expect(simpleIcons.sentry.base64).to.have.all.keys(
'default',
'light',
'dark'
'dark',
)
})

2
lib/logos.js
View File

@ -98,7 +98,7 @@ function getSimpleIcon({ name, color, style }) {
const svgColor = toSvgColor(color)
if (svgColor) {
return svg2base64(
simpleIcons[key].svg.replace('<svg', `<svg fill="${svgColor}"`)
simpleIcons[key].svg.replace('<svg', `<svg fill="${svgColor}"`),
)
} else {
const iconStyle = getSimpleIconStyle({ icon: simpleIcons[key], style })

36
lib/logos.spec.js
View File

File diff suppressed because one or more lines are too long

2
lib/svg-helpers.js
View File

@ -1,6 +1,6 @@
function svg2base64(svg) {
return `data:image/svg+xml;base64,${Buffer.from(svg.trim()).toString(
'base64'
'base64',
)}`
}

2
lib/svg-helpers.spec.js
View File

@ -4,7 +4,7 @@ import { svg2base64 } from './svg-helpers.js'
describe('SVG helpers', function () {
test(svg2base64, () => {
given('<svg xmlns="http://www.w3.org/2000/svg"/>').expect(
'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciLz4='
'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciLz4=',
)
})
})

18
package-lock.json generated
View File

@ -109,7 +109,7 @@
"npm-run-all": "^4.1.5",
"open-cli": "^7.2.0",
"portfinder": "^1.0.32",
"prettier": "2.8.8",
"prettier": "3.0.0",
"prism-react-renderer": "^1.2.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
@ -20806,15 +20806,15 @@
}
},
"node_modules/prettier": {
"version": "2.8.8",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.0.tgz",
"integrity": "sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==",
"dev": true,
"bin": {
"prettier": "bin-prettier.js"
"prettier": "bin/prettier.cjs"
},
"engines": {
"node": ">=10.13.0"
"node": ">=14"
},
"funding": {
"url": "https://github.com/prettier/prettier?sponsor=1"
@ -43451,9 +43451,9 @@
"dev": true
},
"prettier": {
"version": "2.8.8",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.0.tgz",
"integrity": "sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==",
"dev": true
},
"pretty-bytes": {

2
package.json
View File

@ -196,7 +196,7 @@
"npm-run-all": "^4.1.5",
"open-cli": "^7.2.0",
"portfinder": "^1.0.32",
"prettier": "2.8.8",
"prettier": "3.0.0",
"prism-react-renderer": "^1.2.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",

2
scripts/badge-cli.js
View File

@ -19,7 +19,7 @@ async function traceBadge(badgeUrl) {
const server = new Server(config.util.toObject())
await server.start()
const body = await got(
`${server.baseUrl.replace(/\/$/, '')}${badgeUrl}`
`${server.baseUrl.replace(/\/$/, '')}${badgeUrl}`,
).json()
trace.logTrace('outbound', emojic.shield, 'Rendered badge', body)
await server.stop()

4
scripts/capture-timings.js
View File

@ -29,14 +29,14 @@ async function captureTimings(warmupIterations) {
function logResults({ times, iterations, warmupIterations }) {
if (isNaN(iterations)) {
console.log(
'No timings captured. Have you included console.time statements in the badge creation code path?'
'No timings captured. Have you included console.time statements in the badge creation code path?',
)
} else {
const timedIterations = iterations - warmupIterations
for (const [label, time] of Object.entries(times)) {
const averageTime = time / timedIterations
console.log(
`Average '${label}' time over ${timedIterations} iterations: ${averageTime}ms`
`Average '${label}' time over ${timedIterations} iterations: ${averageTime}ms`,
)
}
}

16
scripts/export-openapi-cli.js
View File

@ -13,7 +13,7 @@ function writeSpec(filename, spec) {
fs.writeFileSync(
filename,
yaml.dump(cleaned, { flowLevel: 5, forceQuotes: true })
yaml.dump(cleaned, { flowLevel: 5, forceQuotes: true }),
)
}
@ -22,28 +22,28 @@ function writeSpec(filename, spec) {
for (const category of definitions.categories) {
const services = definitions.services.filter(
service => service.category === category.id && !service.isDeprecated
service => service.category === category.id && !service.isDeprecated,
)
writeSpec(
path.join(specsPath, `${category.id}.yaml`),
category2openapi(category, services)
category2openapi(category, services),
)
}
let coreServices = []
coreServices = coreServices.concat(
definitions.services.filter(
service => service.category === 'static' && !service.isDeprecated
)
service => service.category === 'static' && !service.isDeprecated,
),
)
coreServices = coreServices.concat(
definitions.services.filter(
service => service.category === 'dynamic' && !service.isDeprecated
)
service => service.category === 'dynamic' && !service.isDeprecated,
),
)
writeSpec(
path.join(specsPath, '1core.yaml'),
category2openapi({ name: 'Core' }, coreServices)
category2openapi({ name: 'Core' }, coreServices),
)
})()

2
scripts/update-github-api.js
View File

@ -15,5 +15,5 @@ if (latestDate === config.public.services.github.restApiVersion) {
config.public.services.github.restApiVersion = latestDate
await fs.writeFile(
'./config/default.yml',
yaml.dump(config, { forceQuotes: true })
yaml.dump(config, { forceQuotes: true }),
)

14
server.js
View File

@ -12,13 +12,13 @@ Sentry.init({
dsn: process.env.SENTRY_DSN || config.private.sentry_dsn,
integrations: integrations => {
const filtered = integrations.filter(
integration => !disabledIntegrations.includes(integration.name)
integration => !disabledIntegrations.includes(integration.name),
)
if (filtered.length !== integrations.length - disabledIntegrations.length) {
throw Error(
`An error occurred while filtering integrations. The following inetgrations were found: ${integrations.map(
({ name }) => name
)}`
({ name }) => name,
)}`,
)
}
return filtered
@ -37,14 +37,14 @@ console.dir(config.public, { depth: null })
if (fs.existsSync('.env')) {
console.error(
'Legacy .env file found. It should be deleted and replaced with environment variables or config/local.yml'
'Legacy .env file found. It should be deleted and replaced with environment variables or config/local.yml',
)
process.exit(1)
}
if (config.private.redis_url != null) {
console.error(
'RedisTokenPersistence has been removed. Migrate to SqlTokenPersistence'
'RedisTokenPersistence has been removed. Migrate to SqlTokenPersistence',
)
process.exit(1)
}
@ -52,11 +52,11 @@ if (config.private.redis_url != null) {
const legacySecretsPath = path.join(
path.dirname(fileURLToPath(import.meta.url)),
'private',
'secret.json'
'secret.json',
)
if (fs.existsSync(legacySecretsPath)) {
console.error(
`Legacy secrets file found at ${legacySecretsPath}. It should be deleted and secrets replaced with environment variables or config/local.yml`
`Legacy secrets file found at ${legacySecretsPath}. It should be deleted and secrets replaced with environment variables or config/local.yml`,
)
process.exit(1)
}

2
services/appveyor/appveyor-build.tester.js
View File

@ -25,7 +25,7 @@ t.create('CI status on project that does exist but has no builds yet')
.intercept(nock =>
nock('https://ci.appveyor.com/api/projects/')
.get('/gruntjs/grunt')
.reply(200, {})
.reply(200, {}),
)
.expectBadge({
label: 'build',

2
services/appveyor/appveyor-job-build.spec.js
View File

@ -53,7 +53,7 @@ describe('AppveyorJobBuild', function () {
],
},
},
})
}),
)
.to.throw(NotFound)
.with.property('prettyMessage', 'job not found')

2
services/appveyor/appveyor-tests.service.js
View File

@ -111,7 +111,7 @@ export default class AppVeyorTests extends AppVeyorBase {
passed_label: passedLabel,
failed_label: failedLabel,
skipped_label: skippedLabel,
}
},
) {
const isCompact = compactMessage !== undefined
const data = await this.fetch({ user, repo, branch })

2
services/appveyor/appveyor-tests.tester.js
View File

@ -61,7 +61,7 @@ t.create('Test status on project that does exist but has no builds yet')
.intercept(nock =>
nock('https://ci.appveyor.com/api/projects/')
.get('/gruntjs/grunt')
.reply(200, {})
.reply(200, {}),
)
.expectBadge({
label: 'tests',

4
services/archlinux/archlinux.service.js
View File

@ -31,9 +31,9 @@ export default class ArchLinux extends BaseJsonService {
const data = await this._requestJson({
schema,
url: `https://www.archlinux.org/packages/${encodeURIComponent(
repository
repository,
)}/${encodeURIComponent(architecture)}/${encodeURIComponent(
packageName
packageName,
)}/json/`,
})
return renderVersionBadge({ version: data.pkgver })

2
services/archlinux/archlinux.tester.js
View File

@ -18,7 +18,7 @@ t.create('Arch Linux package (valid)')
pkgname: 'pacman',
pkgver: '5.1.3',
pkgrel: '1',
})
}),
)
.expectBadge({ label: 'arch linux', message: 'v5.1.3' })

2
services/aur/aur.service.js
View File

@ -19,7 +19,7 @@ const aurSchema = Joi.object({
OutOfDate: nonNegativeInteger.allow(null),
Maintainer: Joi.string().required().allow(null),
LastModified: nonNegativeInteger,
})
}),
)
.required(),
}).required()

2
services/aur/aur.tester.js
View File

@ -63,7 +63,7 @@ t.create('license (no license)')
LastModified: 1,
},
],
})
}),
)
.expectBadge({ label: 'license', message: 'not specified' })

6
services/azure-devops/azure-devops-base.js
View File

@ -7,7 +7,7 @@ const latestBuildSchema = Joi.object({
.items(
Joi.object({
id: Joi.number().required(),
})
}),
)
.required(),
}).required()
@ -26,7 +26,7 @@ export default class AzureDevOpsBase extends BaseJsonService {
url,
options,
httpErrors,
})
}),
)
}
@ -35,7 +35,7 @@ export default class AzureDevOpsBase extends BaseJsonService {
project,
definitionId,
branch,
httpErrors
httpErrors,
) {
// Microsoft documentation: https://docs.microsoft.com/en-us/rest/api/azure/devops/build/builds/list?view=azure-devops-rest-5.0
const url = `https://dev.azure.com/${organization}/${project}/_apis/build/builds`

2
services/azure-devops/azure-devops-build.service.js
View File

@ -96,7 +96,7 @@ export default class AzureDevOpsBuild extends BaseSvgScrapingService {
async handle(
{ organization, projectId, definitionId, branch },
{ stage, job }
{ stage, job },
) {
// Microsoft documentation: https://docs.microsoft.com/en-us/rest/api/vsts/build/status/get
const { status } = await fetch(this, {

2
services/azure-devops/azure-devops-build.tester.js
View File

@ -24,7 +24,7 @@ t.create('stage badge')
t.create('job badge')
.get(
'/totodem/Shields.io/5.json?stage=Successful%20Stage&job=Successful%20Job'
'/totodem/Shields.io/5.json?stage=Successful%20Stage&job=Successful%20Job',
)
.expectBadge({
label: 'build',

6
services/azure-devops/azure-devops-coverage.service.js
View File

@ -30,11 +30,11 @@ const buildCodeCoverageSchema = Joi.object({
label: Joi.string().required(),
total: Joi.number().required(),
covered: Joi.number().required(),
})
}),
)
.min(1)
.required(),
})
}),
)
.required(),
}).required()
@ -93,7 +93,7 @@ export default class AzureDevOpsCoverage extends AzureDevOpsBase {
project,
definitionId,
branch,
httpErrors
httpErrors,
)
// Microsoft documentation: https://docs.microsoft.com/en-us/rest/api/azure/devops/test/code%20coverage/get%20build%20code%20coverage?view=azure-devops-rest-5.0
const url = `https://dev.azure.com/${organization}/${project}/_apis/test/codecoverage`

28
services/azure-devops/azure-devops-coverage.tester.js
View File

@ -73,7 +73,7 @@ t.create('unknown build definition')
t.create('404 latest build error response')
.get(mockBadgeUriPath)
.intercept(nock =>
nock(azureDevOpsApiBaseUri).get(mockLatestBuildApiUriPath).reply(404)
nock(azureDevOpsApiBaseUri).get(mockLatestBuildApiUriPath).reply(404),
)
.expectBadge({
label: 'coverage',
@ -85,12 +85,12 @@ t.create('no build response')
.intercept(nock =>
nock(azureDevOpsApiBaseUri)
.get(
`/build/builds?definitions=${nonExistentDefinitionId}&%24top=1&statusFilter=completed&api-version=5.0-preview.4`
`/build/builds?definitions=${nonExistentDefinitionId}&%24top=1&statusFilter=completed&api-version=5.0-preview.4`,
)
.reply(200, {
count: 0,
value: [],
})
}),
)
.expectBadge({ label: 'coverage', message: 'build pipeline not found' })
@ -101,7 +101,7 @@ t.create('404 code coverage error response')
.get(mockLatestBuildApiUriPath)
.reply(200, latestBuildResponse)
.get(mockCodeCoverageApiUriPath)
.reply(404)
.reply(404),
)
.expectBadge({
label: 'coverage',
@ -115,7 +115,7 @@ t.create('invalid code coverage response')
.get(mockLatestBuildApiUriPath)
.reply(200, latestBuildResponse)
.get(mockCodeCoverageApiUriPath)
.reply(200, {})
.reply(200, {}),
)
.expectBadge({ label: 'coverage', message: 'invalid response data' })
@ -126,7 +126,7 @@ t.create('no code coverage reports')
.get(mockLatestBuildApiUriPath)
.reply(200, latestBuildResponse)
.get(mockCodeCoverageApiUriPath)
.reply(200, { coverageData: [] })
.reply(200, { coverageData: [] }),
)
.expectBadge({ label: 'coverage', message: '0%' })
@ -137,7 +137,7 @@ t.create('no code coverage reports')
.get(mockLatestBuildApiUriPath)
.reply(200, latestBuildResponse)
.get(mockCodeCoverageApiUriPath)
.reply(200, { coverageData: [] })
.reply(200, { coverageData: [] }),
)
.expectBadge({ label: 'coverage', message: '0%' })
@ -154,7 +154,7 @@ t.create('no line coverage stats')
coverageStats: [branchCovStat],
},
],
})
}),
)
.expectBadge({ label: 'coverage', message: '0%' })
@ -171,7 +171,7 @@ t.create('single line coverage stats')
coverageStats: [firstLinesCovStat],
},
],
})
}),
)
.expectBadge({ label: 'coverage', message: expCoverageSingleReport })
@ -188,7 +188,7 @@ t.create('mixed line and branch coverage stats')
coverageStats: [firstLinesCovStat, branchCovStat],
},
],
})
}),
)
.expectBadge({ label: 'coverage', message: expCoverageSingleReport })
@ -209,7 +209,7 @@ t.create('multiple line coverage stat reports')
],
},
],
})
}),
)
t.create('single JaCoCo style line coverage stats')
@ -225,7 +225,7 @@ t.create('single JaCoCo style line coverage stats')
coverageStats: [firstLineCovStat],
},
],
})
}),
)
.expectBadge({ label: 'coverage', message: expCoverageSingleReport })
@ -242,7 +242,7 @@ t.create('mixed JaCoCo style line and branch coverage stats')
coverageStats: [firstLineCovStat, branchCovStat],
},
],
})
}),
)
.expectBadge({ label: 'coverage', message: expCoverageSingleReport })
@ -259,6 +259,6 @@ t.create('multiple JaCoCo style line coverage stat reports')
coverageStats: [firstLineCovStat, branchCovStat, secondLineCovStat],
},
],
})
}),
)
.expectBadge({ label: 'coverage', message: expCoverageMultipleReports })

2
services/azure-devops/azure-devops-helpers.js
View File

@ -10,7 +10,7 @@ const schema = Joi.object({
Joi.equal('unknown'),
Joi.equal('set up now'),
Joi.equal('never built'),
Joi.equal('never deployed')
Joi.equal('never deployed'),
)
.required(),
}).required()

4
services/azure-devops/azure-devops-tests.service.js
View File

@ -150,7 +150,7 @@ export default class AzureDevOpsTests extends AzureDevOpsBase {
project,
definitionId,
branch,
httpErrors
httpErrors,
)
// https://dev.azure.com/azuredevops-powershell/azuredevops-powershell/_apis/test/ResultSummaryByBuild?buildId=20
@ -171,7 +171,7 @@ export default class AzureDevOpsTests extends AzureDevOpsBase {
passed_label: passedLabel,
failed_label: failedLabel,
skipped_label: skippedLabel,
}
},
) {
const json = await this.fetchTestResults({
organization,

4
services/azure-devops/azure-devops-tests.tester.js
View File

@ -22,7 +22,7 @@ t.create('404 latest build error response')
statusFilter: 'completed',
'api-version': '5.0-preview.4',
})
.reply(404)
.reply(404),
)
.expectBadge({
label: 'tests',
@ -43,7 +43,7 @@ t.create('no test result summary response')
.reply(200, { count: 1, value: [{ id: 1234 }] })
.get('/test/ResultSummaryByBuild')
.query({ buildId: 1234 })
.reply(404)
.reply(404),
)
.expectBadge({
label: 'tests',

6
services/azure-devops/vso-redirect.tester.js
View File

@ -8,17 +8,17 @@ export const t = new ServiceTester({
t.create('Build: default branch')
.get('/build/totodem/8cf3ec0e-d0c2-4fcd-8206-ad204f254a96/2.svg')
.expectRedirect(
'/azure-devops/build/totodem/8cf3ec0e-d0c2-4fcd-8206-ad204f254a96/2.svg'
'/azure-devops/build/totodem/8cf3ec0e-d0c2-4fcd-8206-ad204f254a96/2.svg',
)
t.create('Build: named branch')
.get('/build/totodem/8cf3ec0e-d0c2-4fcd-8206-ad204f254a96/2/master.svg')
.expectRedirect(
'/azure-devops/build/totodem/8cf3ec0e-d0c2-4fcd-8206-ad204f254a96/2/master.svg'
'/azure-devops/build/totodem/8cf3ec0e-d0c2-4fcd-8206-ad204f254a96/2/master.svg',
)
t.create('Release status')
.get('/release/totodem/8cf3ec0e-d0c2-4fcd-8206-ad204f254a96/1/1.svg')
.expectRedirect(
'/azure-devops/release/totodem/8cf3ec0e-d0c2-4fcd-8206-ad204f254a96/1/1.svg'
'/azure-devops/release/totodem/8cf3ec0e-d0c2-4fcd-8206-ad204f254a96/1/1.svg',
)

6
services/bitbucket/bitbucket-pipelines.service.js
View File

@ -14,11 +14,11 @@ const bitbucketPipelinesSchema = Joi.object({
'FAILED',
'ERROR',
'STOPPED',
'EXPIRED'
'EXPIRED',
),
}).required(),
}).required(),
})
}),
)
.required(),
}).required()
@ -69,7 +69,7 @@ class BitbucketPipelines extends BaseJsonService {
static transform(data) {
const values = data.values.filter(
value => value.state && value.state.name === 'COMPLETED'
value => value.state && value.state.name === 'COMPLETED',
)
if (values.length > 0) {
return values[0].state.result.name

14
services/bitbucket/bitbucket-pipelines.tester.js
View File

@ -47,7 +47,7 @@ t.create('build result (passing)')
.intercept(nock =>
nock('https://api.bitbucket.org')
.get(/^\/2.0\/.*/)
.reply(200, bitbucketApiResponse('SUCCESSFUL'))
.reply(200, bitbucketApiResponse('SUCCESSFUL')),
)
.expectBadge({ label: 'build', message: 'passing' })
@ -56,7 +56,7 @@ t.create('build result (failing)')
.intercept(nock =>
nock('https://api.bitbucket.org')
.get(/^\/2.0\/.*/)
.reply(200, bitbucketApiResponse('FAILED'))
.reply(200, bitbucketApiResponse('FAILED')),
)
.expectBadge({ label: 'build', message: 'failing' })
@ -65,7 +65,7 @@ t.create('build result (error)')
.intercept(nock =>
nock('https://api.bitbucket.org')
.get(/^\/2.0\/.*/)
.reply(200, bitbucketApiResponse('ERROR'))
.reply(200, bitbucketApiResponse('ERROR')),
)
.expectBadge({ label: 'build', message: 'error' })
@ -74,7 +74,7 @@ t.create('build result (stopped)')
.intercept(nock =>
nock('https://api.bitbucket.org')
.get(/^\/2.0\/.*/)
.reply(200, bitbucketApiResponse('STOPPED'))
.reply(200, bitbucketApiResponse('STOPPED')),
)
.expectBadge({ label: 'build', message: 'stopped' })
@ -83,7 +83,7 @@ t.create('build result (expired)')
.intercept(nock =>
nock('https://api.bitbucket.org')
.get(/^\/2.0\/.*/)
.reply(200, bitbucketApiResponse('EXPIRED'))
.reply(200, bitbucketApiResponse('EXPIRED')),
)
.expectBadge({ label: 'build', message: 'expired' })
@ -92,12 +92,12 @@ t.create('build result (unexpected status)')
.intercept(nock =>
nock('https://api.bitbucket.org')
.get(/^\/2.0\/.*/)
.reply(200, bitbucketApiResponse('NEW_AND_UNEXPECTED'))
.reply(200, bitbucketApiResponse('NEW_AND_UNEXPECTED')),
)
.expectBadge({ label: 'build', message: 'invalid response data' })
t.create('build result no branch redirect')
.get('/atlassian/adf-builder-javascript.svg')
.expectRedirect(
'/bitbucket/pipelines/atlassian/adf-builder-javascript/master.svg'
'/bitbucket/pipelines/atlassian/adf-builder-javascript/master.svg',
)

8
services/bitbucket/bitbucket-pull-request.service.js
View File

@ -69,7 +69,7 @@ function pullRequestClassGenerator(raw) {
passKey: 'bitbucket_password',
authorizedOrigins: ['https://bitbucket.org'],
},
config
config,
)
this.bitbucketServerAuthHelper = new AuthHelper(
{
@ -77,7 +77,7 @@ function pullRequestClassGenerator(raw) {
passKey: 'bitbucket_server_password',
serviceKey: 'bitbucketServer',
},
config
config,
)
}
@ -88,7 +88,7 @@ function pullRequestClassGenerator(raw) {
schema,
options: { searchParams: { state: 'OPEN', limit: 0 } },
httpErrors,
})
}),
)
}
@ -107,7 +107,7 @@ function pullRequestClassGenerator(raw) {
},
},
httpErrors,
})
}),
)
}

8
services/bitbucket/bitbucket-pull-request.spec.js
View File

@ -28,8 +28,8 @@ describe('BitbucketPullRequest', function () {
},
private: { bitbucket_username: user, bitbucket_password: pass },
},
{ user: 'atlassian', repo: 'python-bitbucket' }
)
{ user: 'atlassian', repo: 'python-bitbucket' },
),
).to.deep.equal({
message: '42',
color: 'yellow',
@ -61,8 +61,8 @@ describe('BitbucketPullRequest', function () {
},
},
{ user: 'project', repo: 'repo' },
{ server: 'https://bitbucket.example.test' }
)
{ server: 'https://bitbucket.example.test' },
),
).to.deep.equal({
message: '42',
color: 'yellow',

Some files were not shown because too many files have changed in this diff Show More