test: fix breaking tests

adonis-typings/validator.ts

@@ -10,7 +10,7 @@
 declare module '@ioc:Adonis/Core/Validator' {
   import { UUIDVersion } from 'validator/lib/isUUID'
   import { default as validatorJs } from 'validator'
-  import { DateTime, DurationObjectUnits } from 'luxon'
+  import { DateTime, DurationObject } from 'luxon'
   import { RequestContract } from '@ioc:Adonis/Core/Request'
   import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'
   import { MultipartFileContract, FileValidationOptions } from '@ioc:Adonis/Core/BodyParser'
@@ -717,7 +717,7 @@ declare module '@ioc:Adonis/Core/Validator' {
     /**
      * The value of date must be after a given duration
      */
-    after(duration: number, unit: keyof DurationObjectUnits): Rule
+    after(duration: number, unit: keyof DurationObject): Rule
 
     /**
      * The value of date must be after a given date
@@ -735,7 +735,7 @@ declare module '@ioc:Adonis/Core/Validator' {
     /**
      * The value of date must be before a given duration
      */
-    before(duration: number, unit: keyof DurationObjectUnits): Rule
+    before(duration: number, unit: keyof DurationObject): Rule
 
     /**
      * The value of date must be before a given date

package.json

@@ -71,6 +71,7 @@
 	"devDependencies": {
 		"@adonisjs/application": "^5.1.5",
 		"@adonisjs/bodyparser": "^8.0.0",
+		"@adonisjs/drive": "^2.0.2",
 		"@adonisjs/encryption": "^4.0.5",
 		"@adonisjs/http-server": "^5.5.1",
 		"@adonisjs/mrm-preset": "^4.1.2",

src/Validations/date/helpers/offset.ts

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import { DurationObjectUnits, DateTime } from 'luxon'
+import { DurationObject, DateTime } from 'luxon'
 import { ValidationRuntimeOptions } from '@ioc:Adonis/Core/Validator'
 import { isRef, enforceDateTime } from '../../../Validator/helpers'
 
@@ -16,7 +16,7 @@ import { isRef, enforceDateTime } from '../../../Validator/helpers'
  */
 export type CompileReturnType = {
   operator: '>' | '<'
-  offset?: { duration: number; unit: keyof DurationObjectUnits; hasDayDuration: boolean }
+  offset?: { duration: number; unit: keyof DurationObject; hasDayDuration: boolean }
   ref?: string
 }
 

test/validations/after.spec.ts

@@ -8,7 +8,7 @@
  */
 
 import test from 'japa'
-import { DateTime, DurationObjectUnits } from 'luxon'
+import { DateTime, DurationObject } from 'luxon'
 import { SchemaRef, ParsedRule } from '@ioc:Adonis/Core/Validator'
 
 import { rules } from '../../src/Rules'
@@ -22,11 +22,11 @@ function compile(keyword: 'today' | 'tomorrow'): ParsedRule<any>
 // eslint-disable-next-line no-redeclare
 function compile(date: SchemaRef<DateTime>): ParsedRule<any>
 // eslint-disable-next-line no-redeclare
-function compile(interval: number, duration: keyof DurationObjectUnits): ParsedRule<any>
+function compile(interval: number, duration: keyof DurationObject): ParsedRule<any>
 // eslint-disable-next-line no-redeclare
 function compile(
   interval: number | SchemaRef<DateTime> | 'today' | 'tomorrow',
-  duration?: keyof DurationObjectUnits
+  duration?: keyof DurationObject
 ): ParsedRule<any> {
   const { options } =
     typeof interval === 'number'

test/validations/before.spec.ts

@@ -8,7 +8,7 @@
  */
 
 import test from 'japa'
-import { DateTime, DurationObjectUnits } from 'luxon'
+import { DateTime, DurationObject } from 'luxon'
 import { SchemaRef, ParsedRule } from '@ioc:Adonis/Core/Validator'
 
 import { rules } from '../../src/Rules'
@@ -22,11 +22,11 @@ function compile(keyword: 'today' | 'yesterday'): ParsedRule<any>
 // eslint-disable-next-line no-redeclare
 function compile(date: SchemaRef<DateTime>): ParsedRule<any>
 // eslint-disable-next-line no-redeclare
-function compile(interval: number, duration: keyof DurationObjectUnits): ParsedRule<any>
+function compile(interval: number, duration: keyof DurationObject): ParsedRule<any>
 // eslint-disable-next-line no-redeclare
 function compile(
   interval: number | SchemaRef<DateTime> | 'today' | 'yesterday',
-  duration?: keyof DurationObjectUnits
+  duration?: keyof DurationObject
 ): ParsedRule<any> {
   const { options } =
     typeof interval === 'number'

test/validations/file.spec.ts

@@ -8,21 +8,26 @@
  */
 
 import test from 'japa'
-import { rules } from '../../src/Rules'
-import { MessagesBag } from '../../src/MessagesBag'
-import { ApiErrorReporter } from '../../src/ErrorReporter'
+
 import { FileValidationOptions } from '@ioc:Adonis/Core/BodyParser'
 import { File } from '@adonisjs/bodyparser/build/src/Multipart/File'
 
+import { rules } from '../../src/Rules'
 import { validate } from '../fixtures/rules/index'
+import { MessagesBag } from '../../src/MessagesBag'
+import { ApiErrorReporter } from '../../src/ErrorReporter'
 import { file } from '../../src/Validations/primitives/file'
 
 function compile(options: Partial<FileValidationOptions>) {
   return file.compile('literal', 'file', rules['file'](options).options, {})
 }
 
 test.group('File', () => {
-  const multipartFile = new File({ fieldName: 'avatar', clientName: 'avatar', headers: {} }, {})
+  const multipartFile = new File(
+    { fieldName: 'avatar', clientName: 'avatar', headers: {} },
+    {},
+    {} as any
+  )
   multipartFile.state = 'consumed'
   multipartFile.size = 8
   multipartFile.extname = 'jpg'
@@ -77,7 +82,7 @@ test.group('File', () => {
   })
 
   test('report error when size validation fails', (assert) => {
-    const mp = new File({ fieldName: 'avatar', clientName: 'avatar', headers: {} }, {})
+    const mp = new File({ fieldName: 'avatar', clientName: 'avatar', headers: {} }, {}, {} as any)
     mp.state = 'consumed'
     mp.size = 20
     mp.extname = 'jpg'
@@ -106,7 +111,7 @@ test.group('File', () => {
   })
 
   test('report error when extension validation fails', (assert) => {
-    const mp = new File({ fieldName: 'avatar', clientName: 'avatar', headers: {} }, {})
+    const mp = new File({ fieldName: 'avatar', clientName: 'avatar', headers: {} }, {}, {} as any)
     mp.state = 'consumed'
     mp.size = 20
     mp.extname = 'png'
@@ -135,7 +140,7 @@ test.group('File', () => {
   })
 
   test('work fine when field is a valid file', (assert) => {
-    const mp = new File({ fieldName: 'avatar', clientName: 'avatar', headers: {} }, {})
+    const mp = new File({ fieldName: 'avatar', clientName: 'avatar', headers: {} }, {}, {} as any)
     mp.state = 'consumed'
     mp.size = 20
     mp.extname = 'png'

tsconfig.json

@@ -7,6 +7,7 @@
   "files": [
     "./node_modules/@adonisjs/application/build/adonis-typings/index.d.ts",
     "./node_modules/@adonisjs/http-server/build/adonis-typings/index.d.ts",
+    "./node_modules/@adonisjs/drive/build/adonis-typings/index.d.ts",
     "./node_modules/@adonisjs/bodyparser/build/adonis-typings/index.d.ts"
   ]
 }