clones/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-09-21 10:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(e2e): change e2e ports to some not used by immich-dev (#12132)

Browse Source 
use port not taken by immich-dev for e2e
This commit is contained in:
Jonathan Jogenfors 2024-08-30 14:04:02 +02:00 committed by GitHub
parent fa9b2219f8
commit aa04ded311
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/docker-compose.yml
View File

@ -30,7 +30,7 @@ services:
- redis - redis
- database - database
ports: ports:
- 2283:3001 - 2285:3001
redis: redis:
image: redis:6.2-alpine@sha256:e3b17ba9479deec4b7d1eeec1548a253acc5374d68d3b27937fcfe4df8d18c7e image: redis:6.2-alpine@sha256:e3b17ba9479deec4b7d1eeec1548a253acc5374d68d3b27937fcfe4df8d18c7e
@ -43,7 +43,7 @@ services:
POSTGRES_USER: postgres POSTGRES_USER: postgres
POSTGRES_DB: immich POSTGRES_DB: immich
ports: ports:
- 5433:5432 - 5435:5432
volumes: volumes:
model-cache: model-cache:

4
e2e/playwright.config.ts
View File

@ -8,7 +8,7 @@ export default defineConfig({
workers: 1, workers: 1,
reporter: 'html', reporter: 'html',
use: { use: {
baseURL: 'http://127.0.0.1:2283', baseURL: 'http://127.0.0.1:2285',
trace: 'on-first-retry', trace: 'on-first-retry',
}, },
@ -54,7 +54,7 @@ export default defineConfig({
/* Run your local dev server before starting the tests */ /* Run your local dev server before starting the tests */
webServer: { webServer: {
command: 'docker compose up --build -V --remove-orphans', command: 'docker compose up --build -V --remove-orphans',
url: 'http://127.0.0.1:2283', url: 'http://127.0.0.1:2285',
reuseExistingServer: true, reuseExistingServer: true,
}, },
}); });

4
e2e/src/api/specs/oauth.e2e-spec.ts
View File

@ -92,14 +92,14 @@ describe(`/oauth`, () => {
it('should return a redirect uri', async () => { it('should return a redirect uri', async () => {
const { status, body } = await request(app) const { status, body } = await request(app)
.post('/oauth/authorize') .post('/oauth/authorize')
.send({ redirectUri: 'http://127.0.0.1:2283/auth/login' }); .send({ redirectUri: 'http://127.0.0.1:2285/auth/login' });
expect(status).toBe(201); expect(status).toBe(201);
expect(body).toEqual({ url: expect.stringContaining(`${authServer.internal}/auth?`) }); expect(body).toEqual({ url: expect.stringContaining(`${authServer.internal}/auth?`) });
const params = new URL(body.url).searchParams; const params = new URL(body.url).searchParams;
expect(params.get('client_id')).toBe('client-default'); expect(params.get('client_id')).toBe('client-default');
expect(params.get('response_type')).toBe('code'); expect(params.get('response_type')).toBe('code');
expect(params.get('redirect_uri')).toBe('http://127.0.0.1:2283/auth/login'); expect(params.get('redirect_uri')).toBe('http://127.0.0.1:2285/auth/login');
expect(params.get('state')).toBeDefined(); expect(params.get('state')).toBeDefined();
}); });
}); });

6
e2e/src/cli/specs/login.e2e-spec.ts
View File

@ -33,7 +33,7 @@ describe(`immich login`, () => {
const key = await utils.createApiKey(admin.accessToken, [Permission.All]); const key = await utils.createApiKey(admin.accessToken, [Permission.All]);
const { stdout, stderr, exitCode } = await immichCli(['login', app, `${key.secret}`]); const { stdout, stderr, exitCode } = await immichCli(['login', app, `${key.secret}`]);
expect(stdout.split('\n')).toEqual([ expect(stdout.split('\n')).toEqual([
'Logging in to http://127.0.0.1:2283/api', 'Logging in to http://127.0.0.1:2285/api',
'Logged in as admin@immich.cloud', 'Logged in as admin@immich.cloud',
'Wrote auth info to /tmp/immich/auth.yml', 'Wrote auth info to /tmp/immich/auth.yml',
]); ]);
@ -50,8 +50,8 @@ describe(`immich login`, () => {
const key = await utils.createApiKey(admin.accessToken, [Permission.All]); const key = await utils.createApiKey(admin.accessToken, [Permission.All]);
const { stdout, stderr, exitCode } = await immichCli(['login', app.replaceAll('/api', ''), `${key.secret}`]); const { stdout, stderr, exitCode } = await immichCli(['login', app.replaceAll('/api', ''), `${key.secret}`]);
expect(stdout.split('\n')).toEqual([ expect(stdout.split('\n')).toEqual([
'Logging in to http://127.0.0.1:2283', 'Logging in to http://127.0.0.1:2285',
'Discovered API at http://127.0.0.1:2283/api', 'Discovered API at http://127.0.0.1:2285/api',
'Logged in as admin@immich.cloud', 'Logged in as admin@immich.cloud',
'Wrote auth info to /tmp/immich/auth.yml', 'Wrote auth info to /tmp/immich/auth.yml',
]); ]);

2
e2e/src/cli/specs/server-info.e2e-spec.ts
View File

@ -12,7 +12,7 @@ describe(`immich server-info`, () => {
const { stderr, stdout, exitCode } = await immichCli(['server-info']); const { stderr, stdout, exitCode } = await immichCli(['server-info']);
expect(stdout.split('\n')).toEqual([ expect(stdout.split('\n')).toEqual([
expect.stringContaining('Server Info (via admin@immich.cloud'), expect.stringContaining('Server Info (via admin@immich.cloud'),
' Url: http://127.0.0.1:2283/api', ' Url: http://127.0.0.1:2285/api',
expect.stringContaining('Version:'), expect.stringContaining('Version:'),
' Formats:', ' Formats:',
expect.stringContaining('Images:'), expect.stringContaining('Images:'),

6
e2e/src/setup/auth-server.ts
View File

@ -86,14 +86,14 @@ const setup = async () => {
{ {
client_id: OAuthClient.DEFAULT, client_id: OAuthClient.DEFAULT,
client_secret: OAuthClient.DEFAULT, client_secret: OAuthClient.DEFAULT,
redirect_uris: ['http://127.0.0.1:2283/auth/login'], redirect_uris: ['http://127.0.0.1:2285/auth/login'],
grant_types: ['authorization_code'], grant_types: ['authorization_code'],
response_types: ['code'], response_types: ['code'],
}, },
{ {
client_id: OAuthClient.RS256_TOKENS, client_id: OAuthClient.RS256_TOKENS,
client_secret: OAuthClient.RS256_TOKENS, client_secret: OAuthClient.RS256_TOKENS,
redirect_uris: ['http://127.0.0.1:2283/auth/login'], redirect_uris: ['http://127.0.0.1:2285/auth/login'],
grant_types: ['authorization_code'], grant_types: ['authorization_code'],
id_token_signed_response_alg: 'RS256', id_token_signed_response_alg: 'RS256',
jwks: { keys: [await exportJWK(publicKey)] }, jwks: { keys: [await exportJWK(publicKey)] },
@ -101,7 +101,7 @@ const setup = async () => {
{ {
client_id: OAuthClient.RS256_PROFILE, client_id: OAuthClient.RS256_PROFILE,
client_secret: OAuthClient.RS256_PROFILE, client_secret: OAuthClient.RS256_PROFILE,
redirect_uris: ['http://127.0.0.1:2283/auth/login'], redirect_uris: ['http://127.0.0.1:2285/auth/login'],
grant_types: ['authorization_code'], grant_types: ['authorization_code'],
userinfo_signed_response_alg: 'RS256', userinfo_signed_response_alg: 'RS256',
jwks: { keys: [await exportJWK(publicKey)] }, jwks: { keys: [await exportJWK(publicKey)] },

4
e2e/src/utils.ts
View File

@ -53,8 +53,8 @@ type WaitOptions = { event: EventType; id?: string; total?: number; timeout?: nu
type AdminSetupOptions = { onboarding?: boolean }; type AdminSetupOptions = { onboarding?: boolean };
type FileData = { bytes?: Buffer; filename: string }; type FileData = { bytes?: Buffer; filename: string };
const dbUrl = 'postgres://postgres:postgres@127.0.0.1:5433/immich'; const dbUrl = 'postgres://postgres:postgres@127.0.0.1:5435/immich';
export const baseUrl = 'http://127.0.0.1:2283'; export const baseUrl = 'http://127.0.0.1:2285';
export const shareUrl = `${baseUrl}/share`; export const shareUrl = `${baseUrl}/share`;
export const app = `${baseUrl}/api`; export const app = `${baseUrl}/api`;
// TODO move test assets into e2e/assets // TODO move test assets into e2e/assets

4
e2e/src/web/specs/websocket.e2e-spec.ts
View File

@ -13,13 +13,13 @@ test.describe('Websocket', () => {
test('connects using ipv4', async ({ page, context }) => { test('connects using ipv4', async ({ page, context }) => {
await utils.setAuthCookies(context, admin.accessToken); await utils.setAuthCookies(context, admin.accessToken);
await page.goto('http://127.0.0.1:2283/'); await page.goto('http://127.0.0.1:2285/');
await expect(page.locator('#sidebar')).toContainText('Server Online'); await expect(page.locator('#sidebar')).toContainText('Server Online');
}); });
test('connects using ipv6', async ({ page, context }) => { test('connects using ipv6', async ({ page, context }) => {
await utils.setAuthCookies(context, admin.accessToken, '[::1]'); await utils.setAuthCookies(context, admin.accessToken, '[::1]');
await page.goto('http://[::1]:2283/'); await page.goto('http://[::1]:2285/');
await expect(page.locator('#sidebar')).toContainText('Server Online'); await expect(page.locator('#sidebar')).toContainText('Server Online');
}); });
}); });

2
e2e/vitest.config.ts
View File

@ -3,7 +3,7 @@ import { defineConfig } from 'vitest/config';
// skip `docker compose up` if `make e2e` was already run // skip `docker compose up` if `make e2e` was already run
const globalSetup: string[] = ['src/setup/auth-server.ts']; const globalSetup: string[] = ['src/setup/auth-server.ts'];
try { try {
await fetch('http://127.0.0.1:2283/api/server-info/ping'); await fetch('http://127.0.0.1:2285/api/server-info/ping');
} catch { } catch {
globalSetup.push('src/setup/docker-compose.ts'); globalSetup.push('src/setup/docker-compose.ts');
} }