refactor: restructure tests and fix typings reference path in source …

…code Tests needs to be scoped properly, since they are growing in number
adonisjs · Sep 30, 2019 · 17ed065 · 17ed065
1 parent ee75a1d
commit 17ed065
Show file tree

Hide file tree

Showing 18 changed files with 56 additions and 41 deletions.
diff --git a/src/Connection/Manager.ts b/src/Connection/Manager.ts
@@ -7,7 +7,7 @@
 * file that was distributed with this source code.
 */
 
-/// <reference path="../../adonis-typings/database.ts" />
+/// <reference path="../../adonis-typings/index.ts" />
 
 import { EventEmitter } from 'events'
 import { Exception } from '@poppinss/utils'

diff --git a/src/Connection/index.ts b/src/Connection/index.ts
@@ -7,7 +7,7 @@
 * file that was distributed with this source code.
 */
 
-/// <reference path="../../adonis-typings/database.ts" />
+/// <reference path="../../adonis-typings/index.ts" />
 
 import knex from 'knex'
 import { Pool } from 'tarn'

diff --git a/src/Database/QueryBuilder/Chainable.ts b/src/Database/QueryBuilder/Chainable.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
 */
 
-/// <reference path="../../../adonis-typings/database.ts" />
+/// <reference path="../../../adonis-typings/index.ts" />
 
 import knex from 'knex'
 import { ChainableContract, QueryCallback } from '@ioc:Adonis/Lucid/DatabaseQueryBuilder'

diff --git a/src/Database/QueryBuilder/Database.ts b/src/Database/QueryBuilder/Database.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
 */
 
-/// <reference path="../../../adonis-typings/database.ts" />
+/// <reference path="../../../adonis-typings/index.ts" />
 
 import knex from 'knex'
 import { trait } from '@poppinss/traits'

diff --git a/src/Database/QueryBuilder/Insert.ts b/src/Database/QueryBuilder/Insert.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
 */
 
-/// <reference path="../../../adonis-typings/database.ts" />
+/// <reference path="../../../adonis-typings/index.ts" />
 
 import knex from 'knex'
 import { trait } from '@poppinss/traits'

diff --git a/src/Database/QueryBuilder/Raw.ts b/src/Database/QueryBuilder/Raw.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
 */
 
-/// <reference path="../../../adonis-typings/database.ts" />
+/// <reference path="../../../adonis-typings/index.ts" />
 
 import knex from 'knex'
 import { trait } from '@poppinss/traits'

diff --git a/src/Database/index.ts b/src/Database/index.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
 */
 
-/// <reference path="../../adonis-typings/database.ts" />
+/// <reference path="../../adonis-typings/index.ts" />
 
 import { Exception } from '@poppinss/utils'
 import { LoggerContract } from '@ioc:Adonis/Core/Logger'

diff --git a/test/connection-manager.spec.ts → test/connection/connection-manager.spec.ts b/test/connection-manager.spec.ts → test/connection/connection-manager.spec.ts
@@ -7,12 +7,12 @@
 * file that was distributed with this source code.
 */
 
-/// <reference path="../adonis-typings/database.ts" />
+/// <reference path="../../adonis-typings/index.ts" />
 
 import test from 'japa'
 
-import { ConnectionManager } from '../src/Connection/Manager'
-import { getConfig, setup, cleanup, getLogger } from '../test-helpers'
+import { ConnectionManager } from '../../src/Connection/Manager'
+import { getConfig, setup, cleanup, getLogger } from '../../test-helpers'
 
 test.group('ConnectionManager', (group) => {
   group.before(async () => {

diff --git a/test/connection.spec.ts → test/connection/connection.spec.ts b/test/connection.spec.ts → test/connection/connection.spec.ts
@@ -7,13 +7,13 @@
 * file that was distributed with this source code.
 */
 
-/// <reference path="../adonis-typings/database.ts" />
+/// <reference path="../../adonis-typings/index.ts" />
 
 import test from 'japa'
 import { MysqlConfigContract } from '@ioc:Adonis/Lucid/Database'
 
-import { Connection } from '../src/Connection'
-import { getConfig, setup, cleanup, resetTables, getLogger } from '../test-helpers'
+import { Connection } from '../../src/Connection'
+import { getConfig, setup, cleanup, resetTables, getLogger } from '../../test-helpers'
 
 if (process.env.DB !== 'sqlite') {
   test.group('Connection | config', (group) => {

diff --git a/test/database.spec.ts → test/database/database.spec.ts b/test/database.spec.ts → test/database/database.spec.ts
@@ -7,12 +7,12 @@
  * file that was distributed with this source code.
 */
 
-/// <reference path="../adonis-typings/database.ts" />
+/// <reference path="../../adonis-typings/index.ts" />
 
 import test from 'japa'
 
-import { Database } from '../src/Database'
-import { getConfig, setup, cleanup, getLogger, getProfiler } from '../test-helpers'
+import { Database } from '../../src/Database'
+import { getConfig, setup, cleanup, getLogger, getProfiler } from '../../test-helpers'
 
 test.group('Database', (group) => {
   group.before(async () => {

diff --git a/test/insert-query-builder.spec.ts → test/database/insert-query-builder.spec.ts b/test/insert-query-builder.spec.ts → test/database/insert-query-builder.spec.ts
@@ -7,12 +7,12 @@
 * file that was distributed with this source code.
 */
 
-/// <reference path="../adonis-typings/database.ts" />
+/// <reference path="../../adonis-typings/index.ts" />
 
 import test from 'japa'
 
-import { Connection } from '../src/Connection'
-import { getConfig, setup, cleanup, getInsertBuilder, getLogger, getQueryClient } from '../test-helpers'
+import { Connection } from '../../src/Connection'
+import { getConfig, setup, cleanup, getInsertBuilder, getLogger, getQueryClient } from '../../test-helpers'
 
 test.group('Query Builder | insert', (group) => {
   group.before(async () => {

diff --git a/test/query-builder.spec.ts → test/database/query-builder.spec.ts b/test/query-builder.spec.ts → test/database/query-builder.spec.ts
@@ -7,11 +7,11 @@
 * file that was distributed with this source code.
 */
 
-/// <reference path="../adonis-typings/database.ts" />
+/// <reference path="../../adonis-typings/index.ts" />
 
 import test from 'japa'
-import { Connection } from '../src/Connection'
-import { DatabaseQueryBuilder } from '../src/Database/QueryBuilder/Database'
+import { Connection } from '../../src/Connection'
+import { DatabaseQueryBuilder } from '../../src/Database/QueryBuilder/Database'
 import {
   setup,
   cleanup,
@@ -21,7 +21,7 @@ import {
   getQueryBuilder,
   getInsertBuilder,
   getRawQueryBuilder,
-} from '../test-helpers'
+} from '../../test-helpers'
 
 if (process.env.DB !== 'sqlite') {
   test.group('Query Builder | client', (group) => {

diff --git a/test/query-client.spec.ts → test/database/query-client.spec.ts b/test/query-client.spec.ts → test/database/query-client.spec.ts
@@ -7,12 +7,12 @@
 * file that was distributed with this source code.
 */
 
-/// <reference path="../adonis-typings/database.ts" />
+/// <reference path="../../adonis-typings/index.ts" />
 
 import test from 'japa'
-import { Connection } from '../src/Connection'
-import { QueryClient } from '../src/QueryClient'
-import { getConfig, setup, cleanup, getLogger } from '../test-helpers'
+import { Connection } from '../../src/Connection'
+import { QueryClient } from '../../src/QueryClient'
+import { getConfig, setup, cleanup, getLogger } from '../../test-helpers'
 
 test.group('Query client', (group) => {
   group.before(async () => {

diff --git a/test/transactions.spec.ts → test/database/transactions.spec.ts b/test/transactions.spec.ts → test/database/transactions.spec.ts
@@ -7,13 +7,13 @@
 * file that was distributed with this source code.
 */
 
-/// <reference path="../adonis-typings/database.ts" />
+/// <reference path="../../adonis-typings/index.ts" />
 
 import test from 'japa'
 
-import { Connection } from '../src/Connection'
-import { QueryClient } from '../src/QueryClient'
-import { getConfig, setup, cleanup, resetTables, getLogger } from '../test-helpers'
+import { Connection } from '../../src/Connection'
+import { QueryClient } from '../../src/QueryClient'
+import { getConfig, setup, cleanup, resetTables, getLogger } from '../../test-helpers'
 
 test.group('Transaction | query', (group) => {
   group.before(async () => {

diff --git a/test/adapter.spec.ts → test/orm/adapter.spec.ts b/test/adapter.spec.ts → test/orm/adapter.spec.ts
@@ -7,9 +7,11 @@
 * file that was distributed with this source code.
 */
 
+/// <reference path="../../adonis-typings/index.ts" />
+
 import test from 'japa'
-import { column } from '../src/Orm/Decorators'
-import { setup, cleanup, getDb, resetTables, getBaseModel, ormAdapter } from '../test-helpers'
+import { column } from '../../src/Orm/Decorators'
+import { setup, cleanup, getDb, resetTables, getBaseModel, ormAdapter } from '../../test-helpers'
 
 test.group('Adapter', (group) => {
   group.before(async () => {

diff --git a/test/base-model.spec.ts → test/orm/base-model.spec.ts b/test/base-model.spec.ts → test/orm/base-model.spec.ts
@@ -7,10 +7,11 @@
 * file that was distributed with this source code.
 */
 
-import test from 'japa'
+/// <reference path="../../adonis-typings/index.ts" />
 
-import { column, computed, hasOne } from '../src/Orm/Decorators'
-import { FakeAdapter, getBaseModel, ormAdapter, mapToObj } from '../test-helpers'
+import test from 'japa'
+import { column, computed, hasOne } from '../../src/Orm/Decorators'
+import { FakeAdapter, getBaseModel, ormAdapter, mapToObj } from '../../test-helpers'
 
 test.group('Base model | boot', () => {
   test('compute table name from model name', async (assert) => {

diff --git a/test/model-has-one.spec.ts → test/orm/model-has-one.spec.ts b/test/model-has-one.spec.ts → test/orm/model-has-one.spec.ts
@@ -7,9 +7,11 @@
 * file that was distributed with this source code.
 */
 
+/// <reference path="../../adonis-typings/index.ts" />
+
 import test from 'japa'
-import { column, hasOne } from '../src/Orm/Decorators'
-import { ormAdapter, getBaseModel, setup, cleanup, resetTables, getDb } from '../test-helpers'
+import { column, hasOne } from '../../src/Orm/Decorators'
+import { ormAdapter, getBaseModel, setup, cleanup, resetTables, getDb } from '../../test-helpers'
 
 test.group('Model | Has one', (group) => {
   group.before(async () => {

diff --git a/test/model-query-builder.spec.ts → test/orm/model-query-builder.spec.ts b/test/model-query-builder.spec.ts → test/orm/model-query-builder.spec.ts
@@ -7,10 +7,20 @@
 * file that was distributed with this source code.
 */
 
+/// <reference path="../../adonis-typings/index.ts" />
+
 import test from 'japa'
-import { column } from '../src/Orm/Decorators'
-import { ModelQueryBuilder } from '../src/Orm/QueryBuilder'
-import { getBaseModel, ormAdapter, getDb, setup, cleanup, resetTables, getProfiler } from '../test-helpers'
+import { column } from '../../src/Orm/Decorators'
+import { ModelQueryBuilder } from '../../src/Orm/QueryBuilder'
+import {
+  getDb,
+  setup,
+  cleanup,
+  ormAdapter,
+  resetTables,
+  getProfiler,
+  getBaseModel,
+} from '../../test-helpers'
 
 test.group('Model query builder', (group) => {
   group.before(async () => {