test: normalize unix and windows newlines

Author: thetutlage

test-helpers/index.ts

@@ -0,0 +1,12 @@
+/*
+ * @adonisjs/assembler
+ *
+ * (c) Harminder Virk <virk@adonisjs.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+*/
+
+export function toNewlineArray (contents: string): string[] {
+  return contents.split(/\r?\n/)
+}

test/make-command.spec.ts

@@ -13,6 +13,7 @@ import { Ioc } from '@adonisjs/fold'
 import { Filesystem } from '@poppinss/dev-utils'
 import { Application } from '@adonisjs/application/build/standalone'
 
+import { toNewlineArray } from '../test-helpers'
 import MakeCommand from '../commands/Make/Command'
 
 const fs = new Filesystem(join(__dirname, '__app'))
@@ -42,7 +43,10 @@ test.group('Make Command', (group) => {
 
     const GreetCommand = await fs.get('commands/Greet.ts')
     const CommandTemplate = await templates.get('command.txt')
-    assert.equal(GreetCommand, CommandTemplate.replace('${filename}', 'Greet'))
+    assert.deepEqual(
+      toNewlineArray(GreetCommand),
+      toNewlineArray(CommandTemplate.replace('${filename}', 'Greet')),
+    )
   })
 
   test('make a command inside a custom directory', async (assert) => {
@@ -60,6 +64,9 @@ test.group('Make Command', (group) => {
 
     const GreetCommand = await fs.get('foo/Greet.ts')
     const CommandTemplate = await templates.get('command.txt')
-    assert.equal(GreetCommand, CommandTemplate.replace('${filename}', 'Greet'))
+    assert.deepEqual(
+      toNewlineArray(GreetCommand),
+      toNewlineArray(CommandTemplate.replace('${filename}', 'Greet')),
+    )
   })
 })

test/make-controller.spec.ts

@@ -13,6 +13,7 @@ import { Ioc } from '@adonisjs/fold'
 import { Filesystem } from '@poppinss/dev-utils'
 import { Application } from '@adonisjs/application/build/standalone'
 
+import { toNewlineArray } from '../test-helpers'
 import MakeController from '../commands/Make/Controller'
 
 const fs = new Filesystem(join(__dirname, '__app'))
@@ -42,7 +43,10 @@ test.group('Make Controller', (group) => {
 
     const UsersController = await fs.get('app/Controllers/Http/UsersController.ts')
     const ControllerTemplate = await templates.get('controller.txt')
-    assert.equal(UsersController, ControllerTemplate.replace('${filename}', 'UsersController'))
+    assert.deepEqual(
+      toNewlineArray(UsersController),
+      toNewlineArray(ControllerTemplate.replace('${filename}', 'UsersController')),
+    )
   })
 
   test('make a resourceful controller inside the default directory', async (assert) => {
@@ -57,7 +61,10 @@ test.group('Make Controller', (group) => {
 
     const UsersController = await fs.get('app/Controllers/Http/UsersController.ts')
     const ResourceTemplate = await templates.get('resource-controller.txt')
-    assert.equal(UsersController, ResourceTemplate.replace('${filename}', 'UsersController'))
+    assert.deepEqual(
+      toNewlineArray(UsersController),
+      toNewlineArray(ResourceTemplate.replace('${filename}', 'UsersController')),
+    )
   })
 
   test('make a controller inside a custom directory', async (assert) => {
@@ -78,6 +85,9 @@ test.group('Make Controller', (group) => {
 
     const UsersController = await fs.get('app/Controllers/UsersController.ts')
     const ControllerTemplate = await templates.get('controller.txt')
-    assert.equal(UsersController, ControllerTemplate.replace('${filename}', 'UsersController'))
+    assert.deepEqual(
+      toNewlineArray(UsersController),
+      toNewlineArray(ControllerTemplate.replace('${filename}', 'UsersController')),
+    )
   })
 })

test/make-middleware.spec.ts

@@ -13,6 +13,7 @@ import { Ioc } from '@adonisjs/fold'
 import { Filesystem } from '@poppinss/dev-utils'
 import { Application } from '@adonisjs/application/build/standalone'
 
+import { toNewlineArray } from '../test-helpers'
 import MakeMiddleware from '../commands/Make/Middleware'
 
 const fs = new Filesystem(join(__dirname, '__app'))
@@ -42,6 +43,9 @@ test.group('Make Middleware', (group) => {
 
     const SpoofMiddleware = await fs.get('app/Middleware/SpoofAccept.ts')
     const MiddlewareTemplate = await templates.get('middleware.txt')
-    assert.equal(SpoofMiddleware, MiddlewareTemplate.replace('${filename}', 'SpoofAccept'))
+    assert.deepEqual(
+      toNewlineArray(SpoofMiddleware),
+      toNewlineArray(MiddlewareTemplate.replace('${filename}', 'SpoofAccept')),
+    )
   })
 })

test/make-provider.spec.ts

@@ -13,6 +13,7 @@ import { Ioc } from '@adonisjs/fold'
 import { Filesystem } from '@poppinss/dev-utils'
 import { Application } from '@adonisjs/application/build/standalone'
 
+import { toNewlineArray } from '../test-helpers'
 import MakeProvider from '../commands/Make/Provider'
 
 const fs = new Filesystem(join(__dirname, '__app'))
@@ -42,7 +43,10 @@ test.group('Make Provider', (group) => {
 
     const AppProvider = await fs.get('providers/AppProvider.ts')
     const ProviderTemplate = await templates.get('provider.txt')
-    assert.equal(AppProvider, ProviderTemplate.replace('${filename}', 'AppProvider'))
+    assert.deepEqual(
+      toNewlineArray(AppProvider),
+      toNewlineArray(ProviderTemplate.replace('${filename}', 'AppProvider')),
+    )
   })
 
   test('make a provider inside a custom directory', async (assert) => {
@@ -60,6 +64,9 @@ test.group('Make Provider', (group) => {
 
     const AppProvider = await fs.get('foo/AppProvider.ts')
     const ProviderTemplate = await templates.get('provider.txt')
-    assert.equal(AppProvider, ProviderTemplate.replace('${filename}', 'AppProvider'))
+    assert.deepEqual(
+      toNewlineArray(AppProvider),
+      toNewlineArray(ProviderTemplate.replace('${filename}', 'AppProvider')),
+    )
   })
 })