Skip to content

Commit

Permalink
Revert "fix(gitea): set gitea.com as default, update tests and message"
Browse files Browse the repository at this point in the history
This reverts commit 0102608.
  • Loading branch information
CanisHelix committed Jan 4, 2024
1 parent 0102608 commit b566958
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 35 deletions.
3 changes: 1 addition & 2 deletions services/gitea/gitea-helper.js
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
10 changes: 5 additions & 5 deletions services/gitea/gitea-languages-count.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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,
}),
],
Expand All @@ -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,
Expand Down
11 changes: 3 additions & 8 deletions services/gitea/gitea-languages-count.tester.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
)
Expand All @@ -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',
Expand Down
10 changes: 5 additions & 5 deletions services/gitea/gitea-release.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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({
Expand Down Expand Up @@ -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,
Expand Down
21 changes: 6 additions & 15 deletions services/gitea/gitea-release.tester.js
Original file line number Diff line number Diff line change
@@ -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',
)
Expand Down

0 comments on commit b566958

Please sign in to comment.