Skip to content

Commit f2cc416

Browse files
committed
refactor: remove custom factories
1 parent d663542 commit f2cc416

25 files changed

+179
-277
lines changed

test_factories/app.ts

Lines changed: 0 additions & 45 deletions
This file was deleted.

test_factories/encryption.ts

Lines changed: 0 additions & 36 deletions
This file was deleted.

test_factories/http_context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
import { Container } from '@adonisjs/fold'
1111
import type { Logger } from '@adonisjs/logger'
12+
import { LoggerFactory } from '@adonisjs/logger/test_factories/logger'
1213

13-
import { LoggerFactory } from './logger.js'
1414
import { RequestFactory } from './request.js'
1515
import { ResponseFactory } from './response.js'
1616
import type { Request } from '../src/request.js'

test_factories/logger.ts

Lines changed: 0 additions & 34 deletions
This file was deleted.

test_factories/request.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import { Socket } from 'node:net'
1111
import proxyAddr from 'proxy-addr'
1212
import type { Encryption } from '@adonisjs/encryption'
1313
import { IncomingMessage, ServerResponse } from 'node:http'
14+
import { EncryptionFactory } from '@adonisjs/encryption/test_factories/encryption'
1415

1516
import { Request } from '../src/request.js'
16-
import { EncryptionFactory } from './encryption.js'
1717
import { RequestConfig } from '../src/types/request.js'
1818
import { QsParserFactory } from './qs_parser_factory.js'
1919

test_factories/response.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import { Socket } from 'node:net'
1111
import type { Encryption } from '@adonisjs/encryption'
1212
import { IncomingMessage, ServerResponse } from 'node:http'
13+
import { EncryptionFactory } from '@adonisjs/encryption/test_factories/encryption'
1314

1415
import { RouterFactory } from './router.js'
1516
import { Response } from '../src/response.js'
1617
import { Router } from '../src/router/main.js'
17-
import { EncryptionFactory } from './encryption.js'
1818
import { ResponseConfig } from '../src/types/response.js'
1919
import { QsParserFactory } from './qs_parser_factory.js'
2020

test_factories/router.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
import type { Encryption } from '@adonisjs/encryption'
1111
import type { Application } from '@adonisjs/application'
12+
import { AppFactory } from '@adonisjs/application/test_factories/app'
13+
import { EncryptionFactory } from '@adonisjs/encryption/test_factories/encryption'
1214

13-
import { AppFactory } from './app.js'
1415
import { Router } from '../src/router/main.js'
15-
import { EncryptionFactory } from './encryption.js'
1616
import { QsParserFactory } from './qs_parser_factory.js'
1717

1818
type FactoryParameters = {
@@ -31,7 +31,7 @@ export class RouterFactory {
3131
* Returns an instance of the application class
3232
*/
3333
#getApp() {
34-
return this.#parameters.app || new AppFactory().create()
34+
return this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url))
3535
}
3636

3737
/**

test_factories/server_factory.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@
77
* file that was distributed with this source code.
88
*/
99

10+
import { Emitter } from '@adonisjs/events'
1011
import type { Encryption } from '@adonisjs/encryption'
1112
import type { Application } from '@adonisjs/application'
13+
import { AppFactory } from '@adonisjs/application/test_factories/app'
14+
import { EncryptionFactory } from '@adonisjs/encryption/test_factories/encryption'
1215

13-
import { AppFactory } from './app.js'
1416
import { Server } from '../src/server/main.js'
15-
import { EncryptionFactory } from './encryption.js'
16-
1717
import { defineConfig } from '../src/define_config.js'
1818
import type { ServerConfig } from '../src/types/server.js'
19-
import { Emitter } from '@adonisjs/events'
2019

2120
type FactoryParameters = {
2221
app: Application<any, any>
@@ -50,7 +49,7 @@ export class ServerFactory {
5049
* Returns an instance of the application class
5150
*/
5251
#getApp() {
53-
return this.#parameters.app || new AppFactory().create()
52+
return this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url))
5453
}
5554

5655
/**

tests/cookies/client.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
*/
99

1010
import { test } from '@japa/runner'
11+
import { EncryptionFactory } from '@adonisjs/encryption/test_factories/encryption'
12+
1113
import { CookieClient } from '../../src/cookies/client.js'
12-
import { EncryptionFactory } from '../../test_factories/encryption.js'
1314

1415
const encryption = new EncryptionFactory().create()
1516

tests/cookies/drivers/encrypted.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919
import { test } from '@japa/runner'
20-
import { EncryptionFactory } from '../../../test_factories/encryption.js'
20+
import { EncryptionFactory } from '@adonisjs/encryption/test_factories/encryption'
2121
import { pack, unpack, canUnpack } from '../../../src/cookies/drivers/encrypted.js'
2222

2323
const encryption = new EncryptionFactory().create()

0 commit comments

Comments
 (0)