Skip to content

[Enhancement]: Provide Wine-ge/Proton-ge latest version via wine manager #2513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/backend/wiki_game_info/gamesdb/__tests__/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,18 @@ describe('getInfoFromGamesDB', () => {
})

test('catches axios throws', async () => {
jest.spyOn(axios, 'get').mockRejectedValueOnce(new Error('Failed'))
jest.spyOn(axios, 'get').mockRejectedValueOnce({
response: {
data: {
error_description: 'Failed'
}
}
})

const result = await getInfoFromGamesDB('Jotun', 'Grouse', 'legendary')
expect(result).toStrictEqual({ steamID: '' })
expect(logError).toBeCalledWith(
['Was not able to get GamesDB data for Grouse', Error('Failed')],
['Was not able to get GamesDB data for Grouse', 'Failed'],
'ExtraGameInfo'
)
})
Expand Down
5 changes: 4 additions & 1 deletion src/backend/wiki_game_info/gamesdb/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ export async function getGamesdbData(
.get(url, { headers: headers })
.catch((error) => {
logError(
[`Was not able to get GamesDB data for ${game_id}`, error],
[
`Was not able to get GamesDB data for ${game_id}`,
error.response.data.error_description
],
LogPrefix.ExtraGameInfo
)
return null
Expand Down
64 changes: 29 additions & 35 deletions src/backend/wine/manager/downloader/__tests__/main/getter.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,25 @@ import { Repositorys, VersionInfo } from 'common/types'
import { getAvailableVersions } from '../../main'
import { test_data_release_list } from '../test_data/github-api-test-data.json'
import * as axios from 'axios'
import { logError, logWarning } from 'backend/logger/logger'

jest.mock('backend/logger/logger')
jest.mock('backend/logger/logfile')

describe('Main - GetAvailableVersions', () => {
test('fetch releases succesfully', async () => {
axios.default.get = jest.fn().mockResolvedValue(test_data_release_list)

await getAvailableVersions({})
.then((releases: VersionInfo[]) => {
expect(releases).not.toBe([])
expect(releases.length).toBeGreaterThan(0)
expect(releases[2].version).toContain('6.16-GE-1')
})
.catch(() => {
throw Error('No error should be thrown!')
})
await getAvailableVersions({}).then((releases: VersionInfo[]) => {
expect(releases).not.toBe([])
expect(releases.length).toBeGreaterThan(0)
expect(releases[3].version).toContain('6.16-GE-1')
})

expect(axios.default.get).toBeCalledWith(
'https://api.github.com/repos/GloriousEggroll/wine-ge-custom/releases?per_page=100'
)
expect(logError).not.toBeCalled()
})

test('fetch releases succesfully independent', async () => {
Expand All @@ -30,56 +29,51 @@ describe('Main - GetAvailableVersions', () => {
for (let key = 0; key < Object.keys(Repositorys).length / 2; key++) {
await getAvailableVersions({
repositorys: [key]
}).then((releases: VersionInfo[]) => {
expect(releases).not.toBe([])
expect(releases.length).toBeGreaterThan(0)
expect(releases[3].version).toContain('6.16-GE-1')
})
.then((releases: VersionInfo[]) => {
expect(releases).not.toBe([])
expect(releases.length).toBeGreaterThan(0)
expect(releases[2].version).toContain('6.16-GE-1')
})
.catch(() => {
throw Error('No error should be thrown!')
})

expect(axios.default.get).toBeCalledWith(
'https://api.github.com/repos/GloriousEggroll/wine-ge-custom/releases?per_page=100'
)
expect(logError).not.toBeCalled()
}
})

test('fetch releases failed because of 404', async () => {
axios.default.get = jest.fn().mockRejectedValue('Could not fetch tag 404')

for (let key = 0; key < Object.keys(Repositorys).length / 2; key++) {
await getAvailableVersions({ repositorys: [key] })
.then(() => {
throw Error("Function shouldn't success!")
})
.catch((error: Error) => {
expect(error.message).toContain('Could not fetch tag 404')
})
await expect(
getAvailableVersions({ repositorys: [key] })
).resolves.toStrictEqual([])

expect(axios.default.get).toBeCalledWith(
expect.stringContaining('https://api.github.com/repos/')
)
expect(logError).toBeCalledWith(
Error(
'Could not fetch available releases from https://api.github.com/repos/GloriousEggroll/wine-ge-custom/releases with error:\n ' +
'Could not fetch tag 404'
),
'WineDownloader'
)
}
})

test('Invalid repository key returns nothing', async () => {
axios.default.get = jest.fn()
console.warn = jest.fn()

await getAvailableVersions({ repositorys: [-1] })
.then((releases: VersionInfo[]) => {
expect(releases).toStrictEqual([])
expect(releases.length).toBe(0)
})
.catch(() => {
throw Error('No error should be thrown!')
})
await expect(
getAvailableVersions({ repositorys: [-1] })
).resolves.toStrictEqual([])

expect(axios.default.get).not.toBeCalled()
expect(console.warn).toBeCalledWith(
'Unknown and not supported repository key passed! Skip fetch for -1'
expect(logWarning).toBeCalledWith(
'Unknown and not supported repository key passed! Skip fetch for -1',
'WineDownloader'
)
})
})
Loading