Colocate test files with source files

TRUEPIC · Jun 22, 2021 · aa42465 · aa42465
1 parent cda077a
commit aa42465
Show file tree

Hide file tree

Showing 23 changed files with 66 additions and 67 deletions.
diff --git a/README.md b/README.md
@@ -129,9 +129,8 @@ $ npm install
 
 ### Tests
 
-[Jest](https://jestjs.io/) is our testing framework of choice, with
-file-specific tests contained in the `test/src` directory. We strive for 100%
-code coverage.
+[Jest](https://jestjs.io/) is our testing framework of choice. We strive for
+100% code coverage.
 
 To run the tests:
 

diff --git a/jest.config.js b/jest.config.js
@@ -9,5 +9,5 @@ module.exports = {
       },
     ],
   ],
-  testMatch: ['**/test/src/**/*.js'],
+  testPathIgnorePatterns: ['/node_modules/', '/test/'],
 }
diff --git a/test/src/adapters/base.js → src/adapters/base.test.js b/test/src/adapters/base.js → src/adapters/base.test.js
@@ -1,5 +1,5 @@
-const BaseAdapter = require('../../../src/adapters/base')
-const NotImplementedError = require('../../../src/errors/not_implemented')
+const BaseAdapter = require('./base')
+const NotImplementedError = require('../errors/not_implemented')
 
 describe('constructor', () => {
   test('creates an instance of the validator, calls `defineValidation`', () => {

diff --git a/test/src/adapters/knex.js → src/adapters/knex.test.js b/test/src/adapters/knex.js → src/adapters/knex.test.js
@@ -1,7 +1,7 @@
 const knex = require('knex')({ client: 'pg' })
 
-const KnexAdapter = require('../../../src/adapters/knex')
-const ValidationError = require('../../../src/errors/validation')
+const KnexAdapter = require('./knex')
+const ValidationError = require('../errors/validation')
 
 describe('filter', () => {
   test('uses `field` for the column, not `name`', () => {

diff --git a/test/src/config.js → src/config.test.js b/test/src/config.js → src/config.test.js
@@ -1,4 +1,4 @@
-const Config = require('../../src/config')
+const Config = require('./config')
 
 describe('constructor', () => {
   test('accepts an object of values to set', () => {

diff --git a/test/src/errors/base.js → src/errors/base.test.js b/test/src/errors/base.js → src/errors/base.test.js
@@ -1,4 +1,4 @@
-const BaseError = require('../../../src/errors/base')
+const BaseError = require('./base')
 
 test('extends Error', () => {
   expect(new BaseError('test')).toBeInstanceOf(Error)

diff --git a/test/src/index.js → src/index.test.js b/test/src/index.js → src/index.test.js
@@ -1,11 +1,11 @@
 const knex = require('knex')({ client: 'pg' })
 
-const Config = require('../../src/config')
-const EmptyQuerier = require('../queriers/empty')
-const NotImplementedError = require('../../src/errors/not_implemented')
-const QueryQL = require('../../src')
-const TestQuerier = require('../queriers/test')
-const ValidationError = require('../../src/errors/validation')
+const Config = require('./config')
+const EmptyQuerier = require('../test/queriers/empty')
+const NotImplementedError = require('./errors/not_implemented')
+const QueryQL = require('.')
+const TestQuerier = require('../test/queriers/test')
+const ValidationError = require('./errors/validation')
 
 describe('constructor', () => {
   test('accepts a query to set', () => {

diff --git a/test/src/orchestrators/base.js → src/orchestrators/base.test.js b/test/src/orchestrators/base.js → src/orchestrators/base.test.js
@@ -1,9 +1,9 @@
 const knex = require('knex')({ client: 'pg' })
 
-const BaseOrchestrator = require('../../../src/orchestrators/base')
-const NotImplementedError = require('../../../src/errors/not_implemented')
-const TestQuerier = require('../../queriers/test')
-const ValidationError = require('../../../src/errors/validation')
+const BaseOrchestrator = require('./base')
+const NotImplementedError = require('../errors/not_implemented')
+const TestQuerier = require('../../test/queriers/test')
+const ValidationError = require('../errors/validation')
 let buildParser
 
 beforeEach(() => {

diff --git a/test/src/orchestrators/filterer.js → src/orchestrators/filterer.test.js b/test/src/orchestrators/filterer.js → src/orchestrators/filterer.test.js
@@ -1,9 +1,9 @@
 const knex = require('knex')({ client: 'pg' })
 
-const EmptyQuerier = require('../../queriers/empty')
-const Filterer = require('../../../src/orchestrators/filterer')
-const TestQuerier = require('../../queriers/test')
-const ValidationError = require('../../../src/errors/validation')
+const EmptyQuerier = require('../../test/queriers/empty')
+const Filterer = require('./filterer')
+const TestQuerier = require('../../test/queriers/test')
+const ValidationError = require('../errors/validation')
 
 describe('queryKey', () => {
   test('returns the key for filters in the query', () => {

diff --git a/test/src/orchestrators/pager.js → src/orchestrators/pager.test.js b/test/src/orchestrators/pager.js → src/orchestrators/pager.test.js
@@ -1,9 +1,9 @@
 const knex = require('knex')({ client: 'pg' })
 
-const EmptyQuerier = require('../../queriers/empty')
-const Pager = require('../../../src/orchestrators/pager')
-const TestQuerier = require('../../queriers/test')
-const ValidationError = require('../../../src/errors/validation')
+const EmptyQuerier = require('../../test/queriers/empty')
+const Pager = require('./pager')
+const TestQuerier = require('../../test/queriers/test')
+const ValidationError = require('../errors/validation')
 
 describe('queryKey', () => {
   test('returns the key for pagination in the query', () => {

diff --git a/test/src/orchestrators/sorter.js → src/orchestrators/sorter.test.js b/test/src/orchestrators/sorter.js → src/orchestrators/sorter.test.js
@@ -1,9 +1,9 @@
 const knex = require('knex')({ client: 'pg' })
 
-const EmptyQuerier = require('../../queriers/empty')
-const Sorter = require('../../../src/orchestrators/sorter')
-const TestQuerier = require('../../queriers/test')
-const ValidationError = require('../../../src/errors/validation')
+const EmptyQuerier = require('../../test/queriers/empty')
+const Sorter = require('./sorter')
+const TestQuerier = require('../../test/queriers/test')
+const ValidationError = require('../errors/validation')
 
 describe('queryKey', () => {
   test('returns the key for filters in the query', () => {

diff --git a/test/src/parsers/base.js → src/parsers/base.test.js b/test/src/parsers/base.js → src/parsers/base.test.js
@@ -1,7 +1,7 @@
-const BaseParser = require('../../../src/parsers/base')
-const NotImplementedError = require('../../../src/errors/not_implemented')
-const Schema = require('../../../src/schema')
-const ValidationError = require('../../../src/errors/validation')
+const BaseParser = require('./base')
+const NotImplementedError = require('../errors/not_implemented')
+const Schema = require('../schema')
+const ValidationError = require('../errors/validation')
 
 describe('constructor', () => {
   test('accepts a query key to set', () => {

diff --git a/test/src/parsers/filter.js → src/parsers/filter.test.js b/test/src/parsers/filter.js → src/parsers/filter.test.js
@@ -1,6 +1,6 @@
-const FilterParser = require('../../../src/parsers/filter')
-const Schema = require('../../../src/schema')
-const ValidationError = require('../../../src/errors/validation')
+const FilterParser = require('./filter')
+const Schema = require('../schema')
+const ValidationError = require('../errors/validation')
 
 describe('DEFAULTS', () => {
   test('returns `null` as the default name', () => {

diff --git a/test/src/parsers/page.js → src/parsers/page.test.js b/test/src/parsers/page.js → src/parsers/page.test.js
@@ -1,6 +1,6 @@
-const PageParser = require('../../../src/parsers/page')
-const Schema = require('../../../src/schema')
-const ValidationError = require('../../../src/errors/validation')
+const PageParser = require('./page')
+const Schema = require('../schema')
+const ValidationError = require('../errors/validation')
 
 describe('DEFAULTS', () => {
   test('returns `20` as the default size', () => {

diff --git a/test/src/parsers/sort.js → src/parsers/sort.test.js b/test/src/parsers/sort.js → src/parsers/sort.test.js
@@ -1,6 +1,6 @@
-const SortParser = require('../../../src/parsers/sort')
-const Schema = require('../../../src/schema')
-const ValidationError = require('../../../src/errors/validation')
+const SortParser = require('./sort')
+const Schema = require('../schema')
+const ValidationError = require('../errors/validation')
 
 describe('DEFAULTS', () => {
   test('returns `null` as the default name', () => {

diff --git a/test/src/schema.js → src/schema.test.js b/test/src/schema.js → src/schema.test.js
@@ -1,4 +1,4 @@
-const Schema = require('../../src/schema')
+const Schema = require('./schema')
 
 describe('constructor', () => {
   test('defaults to no whitelisted filters', () => {

diff --git a/test/src/services/cache_function.js → src/services/cache_function.test.js b/test/src/services/cache_function.js → src/services/cache_function.test.js
@@ -1,4 +1,4 @@
-const cacheFunction = require('../../../src/services/cache_function')
+const cacheFunction = require('./cache_function')
 
 test('accepts/calls `func` and returns the value', () => {
   const value = 'test123'

diff --git a/test/src/services/flatten_map.js → src/services/flatten_map.test.js b/test/src/services/flatten_map.js → src/services/flatten_map.test.js
@@ -1,4 +1,4 @@
-const flattenMap = require('../../../src/services/flatten_map')
+const flattenMap = require('./flatten_map')
 
 test('uses the map key/value as the object key/value by default', () => {
   const map = new Map([

diff --git a/...ervices/joi_validation_error_converter.js → ...es/joi_validation_error_converter.test.js b/...ervices/joi_validation_error_converter.js → ...es/joi_validation_error_converter.test.js
@@ -1,7 +1,7 @@
 const Joi = require('joi')
 
-const joiValidationErrorConverter = require('../../../src/services/joi_validation_error_converter')
-const ValidationError = require('../../../src/errors/validation')
+const joiValidationErrorConverter = require('./joi_validation_error_converter')
+const ValidationError = require('../errors/validation')
 
 test('prepends optional path prefix to path if path exists', () => {
   const { error } = Joi.object()

diff --git a/test/src/validators/adapter.js → src/validators/adapter.test.js b/test/src/validators/adapter.js → src/validators/adapter.test.js
@@ -1,11 +1,11 @@
 const Joi = require('joi')
 
-const AdapterValidator = require('../../../src/validators/adapter')
-const FilterParser = require('../../../src/parsers/filter')
-const PageParser = require('../../../src/parsers/page')
-const Schema = require('../../../src/schema')
-const SortParser = require('../../../src/parsers/sort')
-const ValidationError = require('../../../src/errors/validation')
+const AdapterValidator = require('./adapter')
+const FilterParser = require('../parsers/filter')
+const PageParser = require('../parsers/page')
+const Schema = require('../schema')
+const SortParser = require('../parsers/sort')
+const ValidationError = require('../errors/validation')
 
 describe('constructor', () => {
   test('accepts/calls `defineSchema` and sets the returned value', () => {

diff --git a/test/src/validators/parser.js → src/validators/parser.test.js b/test/src/validators/parser.js → src/validators/parser.test.js
@@ -1,7 +1,7 @@
 const Joi = require('joi')
 
-const ParserValidator = require('../../../src/validators/parser')
-const ValidationError = require('../../../src/errors/validation')
+const ParserValidator = require('./parser')
+const ValidationError = require('../errors/validation')
 
 describe('constructor', () => {
   test('accepts/calls `defineSchema` and sets the returned value', () => {

diff --git a/test/src/validators/querier/base.js → src/validators/querier/base.test.js b/test/src/validators/querier/base.js → src/validators/querier/base.test.js
@@ -1,6 +1,6 @@
-const BaseValidator = require('../../../../src/validators/querier/base')
-const NotImplementedError = require('../../../../src/errors/not_implemented')
-const ValidationError = require('../../../../src/errors/validation')
+const BaseValidator = require('./base')
+const NotImplementedError = require('../../errors/not_implemented')
+const ValidationError = require('../../errors/validation')
 
 describe('constructor', () => {
   test('accepts/calls `defineSchema` and sets the returned value', () => {

diff --git a/test/src/validators/querier/joi.js → src/validators/querier/joi.test.js b/test/src/validators/querier/joi.js → src/validators/querier/joi.test.js
@@ -1,11 +1,11 @@
 const Joi = require('joi')
 
-const FilterParser = require('../../../../src/parsers/filter')
-const JoiValidator = require('../../../../src/validators/querier/joi')
-const PageParser = require('../../../../src/parsers/page')
-const Schema = require('../../../../src/schema')
-const SortParser = require('../../../../src/parsers/sort')
-const ValidationError = require('../../../../src/errors/validation')
+const FilterParser = require('../../parsers/filter')
+const JoiValidator = require('./joi')
+const PageParser = require('../../parsers/page')
+const Schema = require('../../schema')
+const SortParser = require('../../parsers/sort')
+const ValidationError = require('../../errors/validation')
 
 describe('constructor', () => {
   test('accepts/calls `defineSchema(Joi)` and sets the returned value', () => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,5 +9,5 @@ module.exports = { @@
           },
         ],
       ],
-      testMatch: ['**/test/src/**/*.js'],
+      testPathIgnorePatterns: ['/node_modules/', '/test/'],
     }