diff --git a/services/github/github-pipenv.tester.js b/services/github/github-pipenv.tester.js index 578a85c91b95c..6ae2de5f2a148 100644 --- a/services/github/github-pipenv.tester.js +++ b/services/github/github-pipenv.tester.js @@ -1,13 +1,13 @@ import Joi from 'joi' import { ServiceTester } from '../tester.js' import { + isCommitHash, isVPlusDottedVersionAtLeastOne, isVPlusDottedVersionNClausesWithOptionalSuffix, } from '../test-validators.js' // e.g. v19.3b0 const isBlackVersion = Joi.string().regex(/^v\d+(\.\d+)*(.*)?$/) -const isShortSha = Joi.string().regex(/[0-9a-f]{7}/) export const t = new ServiceTester({ id: 'GithubPipenv', @@ -82,10 +82,8 @@ t.create('Locked version of unknown dependency') }) t.create('Locked version of VCS dependency') - .get( - '/locked/dependency-version/thorn-oss/perception/dev/videoalignment.json', - ) + .get('/locked/dependency-version/pypa/pipenv/dev/pypiserver.json') .expectBadge({ - label: 'videoalignment', - message: isShortSha, + label: 'pypiserver', + message: isCommitHash, }) diff --git a/services/test-validators.js b/services/test-validators.js index 489cce69f1ae6..34339fadd24e8 100644 --- a/services/test-validators.js +++ b/services/test-validators.js @@ -55,6 +55,8 @@ const isPhpVersionReduction = withRegex( /^((>= \d+(\.\d+)?)|(\d+\.\d+(, \d+\.\d+)*)|(\d+\.\d+ - \d+\.\d+))(, HHVM)?$/, ) +const isCommitHash = withRegex(/^[a-f0-9]{7,40}$/) + const isStarRating = withRegex( /^(?=.{5}$)(\u2605{0,5}[\u00BC\u00BD\u00BE]?\u2606{0,5})$/, ) @@ -187,6 +189,7 @@ export { isVPlusDottedVersionNClausesWithOptionalSuffixAndEpoch, isComposerVersion, isPhpVersionReduction, + isCommitHash, isStarRating, isMetric, isMetricAllowNegative,