diff --git a/services/gitea/gitea-helper.js b/services/gitea/gitea-helper.js index 3996cb49218461..51242d819d5087 100644 --- a/services/gitea/gitea-helper.js +++ b/services/gitea/gitea-helper.js @@ -1,6 +1,5 @@ const documentation = ` -Note that only internet-accessible Gitea/Forgejo based instances are supported, for example https://gitea.com, https://codeberg.org. -For self-hosted instances, the gitea_url parameter is required. +Note that the gitea_url parameter is required because there is canonical hosted gitea service provided by Gitea. ` function httpErrorsFor() { diff --git a/services/gitea/gitea-languages-count.service.js b/services/gitea/gitea-languages-count.service.js index 91854d19d1bd0c..819198521b6476 100644 --- a/services/gitea/gitea-languages-count.service.js +++ b/services/gitea/gitea-languages-count.service.js @@ -12,7 +12,7 @@ The keys could be anything and {} is a valid response (e.g: for an empty repo) const schema = Joi.object().pattern(/./, nonNegativeInteger) const queryParamSchema = Joi.object({ - gitea_url: optionalUrl, + gitea_url: optionalUrl.required(), }).required() export default class GiteaLanguageCount extends GiteaBase { @@ -32,15 +32,15 @@ export default class GiteaLanguageCount extends GiteaBase { parameters: [ pathParam({ name: 'user', - example: 'gitea', + example: 'forgejo', }), pathParam({ name: 'repo', - example: 'tea', + example: 'forgejo', }), queryParam({ name: 'gitea_url', - example: 'https://gitea.com', + example: 'https://codeberg.org', required: true, }), ], @@ -66,7 +66,7 @@ export default class GiteaLanguageCount extends GiteaBase { }) } - async handle({ user, repo }, { gitea_url: baseUrl = 'https://gitea.com' }) { + async handle({ user, repo }, { gitea_url: baseUrl }) { const data = await this.fetch({ user, repo, diff --git a/services/gitea/gitea-languages-count.tester.js b/services/gitea/gitea-languages-count.tester.js index fe94a2fe905f78..9d4f6a965e327f 100644 --- a/services/gitea/gitea-languages-count.tester.js +++ b/services/gitea/gitea-languages-count.tester.js @@ -3,12 +3,7 @@ import { createServiceTester } from '../tester.js' export const t = await createServiceTester() -t.create('language count').get('/gitea/tea.json').expectBadge({ - label: 'languages', - message: Joi.number().integer().positive(), -}) - -t.create('language count (empty repo) (self-managed)') +t.create('language count (empty repo)') .get( '/CanisHelix/shields-badge-test-empty.json?gitea_url=https://codeberg.org', ) @@ -17,14 +12,14 @@ t.create('language count (empty repo) (self-managed)') message: '0', }) -t.create('language count (self-managed)') +t.create('language count') .get('/CanisHelix/shields-badge-test.json?gitea_url=https://codeberg.org') .expectBadge({ label: 'languages', message: Joi.number().integer().positive(), }) -t.create('language count (user or repo not found) (self-managed)') +t.create('language count (user or repo not found)') .get('/CanisHelix/does-not-exist.json?gitea_url=https://codeberg.org') .expectBadge({ label: 'languages', diff --git a/services/gitea/gitea-release.service.js b/services/gitea/gitea-release.service.js index 3b62424277603b..2188f0e135fcf3 100644 --- a/services/gitea/gitea-release.service.js +++ b/services/gitea/gitea-release.service.js @@ -18,7 +18,7 @@ const displayNameEnum = ['tag', 'release'] const dateOrderByEnum = ['created_at', 'published_at'] const queryParamSchema = Joi.object({ - gitea_url: optionalUrl, + gitea_url: optionalUrl.required(), include_prereleases: Joi.equal(''), sort: Joi.string() .valid(...sortEnum) @@ -48,15 +48,15 @@ export default class GiteaRelease extends GiteaBase { parameters: [ pathParam({ name: 'user', - example: 'gitea', + example: 'forgejo', }), pathParam({ name: 'repo', - example: 'tea', + example: 'forgejo', }), queryParam({ name: 'gitea_url', - example: 'https://gitea.com', + example: 'https://codeberg.org', required: true, }), queryParam({ @@ -122,7 +122,7 @@ export default class GiteaRelease extends GiteaBase { async handle( { user, repo }, { - gitea_url: baseUrl = 'https://gitea.com', + gitea_url: baseUrl, include_prereleases: pre, sort, display_name: displayName, diff --git a/services/gitea/gitea-release.tester.js b/services/gitea/gitea-release.tester.js index 9c7602997e8ced..1f6894e6215cf4 100644 --- a/services/gitea/gitea-release.tester.js +++ b/services/gitea/gitea-release.tester.js @@ -1,48 +1,39 @@ -import Joi from 'joi' import { createServiceTester } from '../tester.js' export const t = await createServiceTester() t.create('Release (latest by date)') - .get('/gitea/tea.json') - .expectBadge({ - label: 'release', - message: Joi.string(), - color: Joi.any().valid(...['orange', 'blue']), - }) - -t.create('Release (latest by date) (self-managed)') .get('/CanisHelix/shields-badge-test.json?gitea_url=https://codeberg.org') .expectBadge({ label: 'release', message: 'v3.0.0', color: 'blue' }) -t.create('Release (latest by date, order by created_at) (self-managed)') +t.create('Release (latest by date, order by created_at)') .get( '/CanisHelix/shields-badge-test.json?gitea_url=https://codeberg.org&date_order_by=created_at', ) .expectBadge({ label: 'release', message: 'v3.0.0', color: 'blue' }) -t.create('Release (latest by date, order by published_at) (self-managed)') +t.create('Release (latest by date, order by published_at)') .get( '/CanisHelix/shields-badge-test.json?gitea_url=https://codeberg.org&date_order_by=published_at', ) .expectBadge({ label: 'release', message: 'v3.0.0', color: 'blue' }) -t.create('Release (latest by semver) (self-managed)') +t.create('Release (latest by semver)') .get( '/CanisHelix/shields-badge-test.json?gitea_url=https://codeberg.org&sort=semver', ) .expectBadge({ label: 'release', message: 'v4.0.0', color: 'blue' }) -t.create('Release (latest by semver pre-release) (self-managed)') +t.create('Release (latest by semver pre-release)') .get( '/CanisHelix/shields-badge-test.json?gitea_url=https://codeberg.org&sort=semver&include_prereleases', ) .expectBadge({ label: 'release', message: 'v5.0.0-rc1', color: 'orange' }) -t.create('Release (project not found) (self-managed)') +t.create('Release (project not found)') .get('/CanisHelix/does-not-exist.json?gitea_url=https://codeberg.org') .expectBadge({ label: 'release', message: 'user or repo not found' }) -t.create('Release (no tags) (self-managed)') +t.create('Release (no tags)') .get( '/CanisHelix/shields-badge-test-empty.json?gitea_url=https://codeberg.org', )