Skip to content

test(e2e): Rename nuxt-5 middleware files to avoid Nitro's dotted suffixes #25923

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.

Sign up for GitHub

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
nicohrubec merged 1 commit into from
Oct 30, 2026
Merged

test(e2e): Rename nuxt-5 middleware files to avoid Nitro's dotted suffixes #25923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 ...ions/nuxt-5/server/middleware/01.first.ts → ...ions/nuxt-5/server/middleware/01-first.ts
View file
Open in desktop
File renamed without changes.
0 ...ons/nuxt-5/server/middleware/02.second.ts → ...ons/nuxt-5/server/middleware/02-second.ts
View file
Open in desktop
File renamed without changes.
0 ...tions/nuxt-5/server/middleware/03.auth.ts → ...tions/nuxt-5/server/middleware/03-auth.ts
View file
Open in desktop
File renamed without changes.
0 ...ions/nuxt-5/server/middleware/04.hooks.ts → ...ions/nuxt-5/server/middleware/04-hooks.ts
View file
Open in desktop
File renamed without changes.
0 ...uxt-5/server/middleware/05.array-hooks.ts → ...uxt-5/server/middleware/05-array-hooks.ts
View file
Open in desktop
File renamed without changes.
0 ...eware/nuxt-server/06.nuxt-server-first.ts → ...eware/nuxt-server/06-nuxt-server-first.ts
View file
Open in desktop
File renamed without changes.
0 ...leware/nuxt-server/07.nuxt-server-auth.ts → ...leware/nuxt-server/07-nuxt-server-auth.ts
View file
Open in desktop
File renamed without changes.
42 changes: 21 additions & 21 deletions dev-packages/e2e-tests/test-applications/nuxt-5/tests/middleware.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ import { IMPORT_SURFACES } from './importSurfaces';
// simple middleware has a copy.
const MIDDLEWARE = {
nitro: {
names: ['01.first', '02.second', '03.auth', '04.hooks', '05.array-hooks'],
simpleNames: ['01.first', '02.second', '03.auth'],
names: ['01-first', '02-second', '03-auth', '04-hooks', '05-array-hooks'],
simpleNames: ['01-first', '02-second', '03-auth'],
// 3 simple + 2 hooks (middleware+handler) + 3 array hooks (2 middleware + 1 handler)
spanCount: 8,
authName: '03.auth',
authName: '03-auth',
authErrorQuery: 'throwError=true',
authErrorMessage: 'Auth middleware error',
},
'nuxt/server': {
names: ['06.nuxt-server-first', '07.nuxt-server-auth'],
simpleNames: ['06.nuxt-server-first', '07.nuxt-server-auth'],
names: ['06-nuxt-server-first', '07-nuxt-server-auth'],
simpleNames: ['06-nuxt-server-first', '07-nuxt-server-auth'],
spanCount: 2,
authName: '07.nuxt-server-auth',
authName: '07-nuxt-server-auth',
authErrorQuery: 'throwNuxtServerError=true',
authErrorMessage: 'nuxt/server auth middleware error',
},
Expand Down Expand Up @@ -127,17 +127,17 @@ test.describe('Server Middleware Instrumentation (nitro hooks)', () => {
expect(response.status()).toBe(200);

const spans = await spansPromise;
const middlewareSpan = findMiddlewareSpan(spans, '04.hooks', 'middleware');
const handlerSpan = findMiddlewareSpan(spans, '04.hooks', 'handler');
const middlewareSpan = findMiddlewareSpan(spans, '04-hooks', 'middleware');
const handlerSpan = findMiddlewareSpan(spans, '04-hooks', 'handler');

// h3 v2 has no `onBeforeResponse`, so a hooks object gives only `middleware` and `handler` spans.
expect(spans.filter(span => span.attributes['nuxt.middleware.name']?.value === '04.hooks')).toHaveLength(2);
expect(spans.filter(span => span.attributes['nuxt.middleware.name']?.value === '04-hooks')).toHaveLength(2);

expect(middlewareSpan?.name).toBe('04.hooks.middleware');
expect(middlewareSpan?.name).toBe('04-hooks.middleware');
// h3 v2 always stores `middleware` as an array, so even a single hook has an index.
expect(middlewareSpan?.attributes['nuxt.middleware.hook.index']?.value).toBe(0);

expect(handlerSpan?.name).toBe('04.hooks');
expect(handlerSpan?.name).toBe('04-hooks');
expect(handlerSpan?.attributes['nuxt.middleware.hook.index']).toBeUndefined();
});

Expand All @@ -148,15 +148,15 @@ test.describe('Server Middleware Instrumentation (nitro hooks)', () => {
expect(response.status()).toBe(200);

const spans = await spansPromise;
const arrayHooksSpans = spans.filter(span => span.attributes['nuxt.middleware.name']?.value === '05.array-hooks');
const middleware0Span = findMiddlewareSpan(spans, '05.array-hooks', 'middleware', 0);
const middleware1Span = findMiddlewareSpan(spans, '05.array-hooks', 'middleware', 1);
const handlerSpan = findMiddlewareSpan(spans, '05.array-hooks', 'handler');
const arrayHooksSpans = spans.filter(span => span.attributes['nuxt.middleware.name']?.value === '05-array-hooks');
const middleware0Span = findMiddlewareSpan(spans, '05-array-hooks', 'middleware', 0);
const middleware1Span = findMiddlewareSpan(spans, '05-array-hooks', 'middleware', 1);
const handlerSpan = findMiddlewareSpan(spans, '05-array-hooks', 'handler');

expect(arrayHooksSpans).toHaveLength(3);
expect(middleware0Span?.name).toBe('05.array-hooks.middleware');
expect(middleware1Span?.name).toBe('05.array-hooks.middleware');
expect(handlerSpan?.name).toBe('05.array-hooks');
expect(middleware0Span?.name).toBe('05-array-hooks.middleware');
expect(middleware1Span?.name).toBe('05-array-hooks.middleware');
expect(handlerSpan?.name).toBe('05-array-hooks');
expect(handlerSpan?.attributes['nuxt.middleware.hook.index']).toBeUndefined();
});

Expand All @@ -171,7 +171,7 @@ test.describe('Server Middleware Instrumentation (nitro hooks)', () => {

const [spans, errorEvent] = await Promise.all([spansPromise, errorEventPromise]);

expect(findMiddlewareSpan(spans, '04.hooks', 'middleware')?.status).toBe('error');
expect(findMiddlewareSpan(spans, '04-hooks', 'middleware')?.status).toBe('error');
expect(errorEvent.exception?.values?.[0]?.value).toBe('OnRequest hook error');
});

Expand All @@ -186,8 +186,8 @@ test.describe('Server Middleware Instrumentation (nitro hooks)', () => {

const [spans, errorEvent] = await Promise.all([spansPromise, errorEventPromise]);

expect(findMiddlewareSpan(spans, '05.array-hooks', 'middleware', 0)?.status).toBe('ok');
expect(findMiddlewareSpan(spans, '05.array-hooks', 'middleware', 1)?.status).toBe('error');
expect(findMiddlewareSpan(spans, '05-array-hooks', 'middleware', 0)?.status).toBe('ok');
expect(findMiddlewareSpan(spans, '05-array-hooks', 'middleware', 1)?.status).toBe('error');
expect(errorEvent.exception?.values?.[0]?.value).toBe('OnRequest[1] hook error');
});
});
Loading