From 0426e099f7b5bb51a1356d899dcec8574f285165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Thu, 31 Jan 2019 09:55:34 +0100 Subject: [PATCH] build: move test files to `src/__tests__` in example apps - Source files are compiled from `src/{foo}` to `dist/{foo}`, the same pattern is applied to test files too. - Both TypeScript sources and JavaScript output are stored in the same path relative to project root. This makes it much easier to refer to test fixtures. This is a follow-up for 066d52510cda. --- examples/hello-world/package.json | 6 +++--- .../__tests__}/acceptance/application.acceptance.ts | 2 +- examples/hello-world/tsconfig.build.json | 4 ++-- examples/log-extension/package.json | 4 ++-- .../__tests__}/acceptance/log.extension.acceptance.ts | 0 .../{test => src/__tests__}/in-memory-logger.ts | 0 .../log-extension/{test => src/__tests__}/log-spy.ts | 0 .../__tests__}/unit/decorators/log.decorator.unit.ts | 0 .../__tests__}/unit/mixins/log.mixin.unit.ts | 0 .../unit/providers/log-action.provider.unit.ts | 0 .../__tests__}/unit/providers/timer.provider.unit.ts | 0 examples/log-extension/tsconfig.build.json | 4 ++-- examples/rpc-server/package.json | 4 ++-- examples/rpc-server/{test => src/__tests__}/README.md | 0 .../__tests__}/unit/controllers/greet.controller.unit.ts | 2 +- .../{test => src/__tests__}/unit/rpc.router.unit.ts | 4 ++-- examples/soap-calculator/package.json | 4 ++-- .../__tests__}/acceptance/application.acceptance.ts | 2 +- .../__tests__}/acceptance/home-page.acceptance.ts | 0 .../{test => src/__tests__}/acceptance/test-helper.ts | 0 .../soap-calculator/{test => src/__tests__}/helpers.ts | 2 +- .../services/calculator.service.integration.ts | 4 ++-- examples/soap-calculator/src/application.ts | 2 +- examples/soap-calculator/tsconfig.build.json | 4 ++-- examples/todo-list/package.json | 4 ++-- .../__tests__}/acceptance/home-page.acceptance.ts | 0 .../{test => src/__tests__}/acceptance/test-helper.ts | 0 .../__tests__}/acceptance/todo-list-image.acceptance.ts | 9 +++------ .../__tests__}/acceptance/todo-list-todo.acceptance.ts | 6 +++--- .../__tests__}/acceptance/todo-list.acceptance.ts | 6 +++--- .../__tests__}/acceptance/todo.acceptance.ts | 6 +++--- examples/todo-list/{test => src/__tests__}/helpers.ts | 2 +- .../unit/controllers/todo-list-todo.controller.unit.ts | 6 +++--- .../unit/controllers/todo-list.controller.unit.ts | 6 +++--- .../__tests__}/unit/controllers/todo.controller.unit.ts | 6 +++--- examples/todo-list/src/application.ts | 2 +- examples/todo-list/tsconfig.build.json | 2 +- examples/todo/package.json | 4 ++-- .../__tests__}/acceptance/home-page.acceptance.ts | 0 .../{test => src/__tests__}/acceptance/test-helper.ts | 0 .../__tests__}/acceptance/todo.acceptance.ts | 6 +++--- examples/todo/{test => src/__tests__}/helpers.ts | 6 +++--- .../integration/services/geocoder.service.integration.ts | 4 ++-- .../__tests__}/unit/controllers/todo.controller.unit.ts | 8 ++++---- examples/todo/src/application.ts | 2 +- examples/todo/tsconfig.build.json | 4 ++-- package.json | 2 +- 47 files changed, 68 insertions(+), 71 deletions(-) rename examples/hello-world/{test => src/__tests__}/acceptance/application.acceptance.ts (93%) rename examples/log-extension/{test => src/__tests__}/acceptance/log.extension.acceptance.ts (100%) rename examples/log-extension/{test => src/__tests__}/in-memory-logger.ts (100%) rename examples/log-extension/{test => src/__tests__}/log-spy.ts (100%) rename examples/log-extension/{test => src/__tests__}/unit/decorators/log.decorator.unit.ts (100%) rename examples/log-extension/{test => src/__tests__}/unit/mixins/log.mixin.unit.ts (100%) rename examples/log-extension/{test => src/__tests__}/unit/providers/log-action.provider.unit.ts (100%) rename examples/log-extension/{test => src/__tests__}/unit/providers/timer.provider.unit.ts (100%) rename examples/rpc-server/{test => src/__tests__}/README.md (100%) rename examples/rpc-server/{test => src/__tests__}/unit/controllers/greet.controller.unit.ts (95%) rename examples/rpc-server/{test => src/__tests__}/unit/rpc.router.unit.ts (96%) rename examples/soap-calculator/{test => src/__tests__}/acceptance/application.acceptance.ts (97%) rename examples/soap-calculator/{test => src/__tests__}/acceptance/home-page.acceptance.ts (100%) rename examples/soap-calculator/{test => src/__tests__}/acceptance/test-helper.ts (100%) rename examples/soap-calculator/{test => src/__tests__}/helpers.ts (73%) rename examples/soap-calculator/{test => src/__tests__}/integration/services/calculator.service.integration.ts (91%) rename examples/todo-list/{test => src/__tests__}/acceptance/home-page.acceptance.ts (100%) rename examples/todo-list/{test => src/__tests__}/acceptance/test-helper.ts (100%) rename examples/todo-list/{test => src/__tests__}/acceptance/todo-list-image.acceptance.ts (94%) rename examples/todo-list/{test => src/__tests__}/acceptance/todo-list-todo.acceptance.ts (97%) rename examples/todo-list/{test => src/__tests__}/acceptance/todo-list.acceptance.ts (97%) rename examples/todo-list/{test => src/__tests__}/acceptance/todo.acceptance.ts (96%) rename examples/todo-list/{test => src/__tests__}/helpers.ts (97%) rename examples/todo-list/{test => src/__tests__}/unit/controllers/todo-list-todo.controller.unit.ts (96%) rename examples/todo-list/{test => src/__tests__}/unit/controllers/todo-list.controller.unit.ts (96%) rename examples/todo-list/{test => src/__tests__}/unit/controllers/todo.controller.unit.ts (96%) rename examples/todo/{test => src/__tests__}/acceptance/home-page.acceptance.ts (100%) rename examples/todo/{test => src/__tests__}/acceptance/test-helper.ts (100%) rename examples/todo/{test => src/__tests__}/acceptance/todo.acceptance.ts (97%) rename examples/todo/{test => src/__tests__}/helpers.ts (92%) rename examples/todo/{test => src/__tests__}/integration/services/geocoder.service.integration.ts (92%) rename examples/todo/{test => src/__tests__}/unit/controllers/todo.controller.unit.ts (95%) diff --git a/examples/hello-world/package.json b/examples/hello-world/package.json index d4aff77eedbb..df6c83184ab3 100644 --- a/examples/hello-world/package.json +++ b/examples/hello-world/package.json @@ -7,7 +7,7 @@ "node": ">=8.9" }, "scripts": { - "acceptance": "lb-mocha \"dist/test/acceptance/**/*.js\"", + "acceptance": "lb-mocha \"dist/__tests__/acceptance/**/*.js\"", "build:apidocs": "lb-apidocs", "build": "lb-tsc es2017 --outDir dist", "build:watch": "lb-tsc es2017 --outDir dist --watch", @@ -21,9 +21,9 @@ "tslint": "lb-tslint", "tslint:fix": "npm run tslint -- --fix", "pretest": "npm run clean && npm run build", - "test": "lb-mocha --allow-console-logs \"dist/test\"", + "test": "lb-mocha --allow-console-logs \"dist/__tests__/**/*.js\"", "posttest": "npm run lint", - "test:dev": "lb-mocha --allow-console-logs dist/test/**/*.js && npm run posttest", + "test:dev": "lb-mocha --allow-console-logs dist/__tests__/**/*.js && npm run posttest", "prestart": "npm run build", "start": "node ." }, diff --git a/examples/hello-world/test/acceptance/application.acceptance.ts b/examples/hello-world/src/__tests__/acceptance/application.acceptance.ts similarity index 93% rename from examples/hello-world/test/acceptance/application.acceptance.ts rename to examples/hello-world/src/__tests__/acceptance/application.acceptance.ts index 70c171431e2f..4022d45bc3c4 100644 --- a/examples/hello-world/test/acceptance/application.acceptance.ts +++ b/examples/hello-world/src/__tests__/acceptance/application.acceptance.ts @@ -9,7 +9,7 @@ import { expect, givenHttpServerConfig, } from '@loopback/testlab'; -import {HelloWorldApplication} from '../../src/application'; +import {HelloWorldApplication} from '../../application'; describe('Application', () => { let app: HelloWorldApplication; diff --git a/examples/hello-world/tsconfig.build.json b/examples/hello-world/tsconfig.build.json index f8bd0f50ef8f..6e15e4be4f6f 100644 --- a/examples/hello-world/tsconfig.build.json +++ b/examples/hello-world/tsconfig.build.json @@ -2,7 +2,7 @@ "$schema": "http://json.schemastore.org/tsconfig", "extends": "@loopback/build/config/tsconfig.common.json", "compilerOptions": { - "rootDir": "." + "rootDir": "src" }, - "include": ["index.ts", "src", "test"] + "include": ["src"] } diff --git a/examples/log-extension/package.json b/examples/log-extension/package.json index 30776e21bfdc..6d4f4920d7e0 100644 --- a/examples/log-extension/package.json +++ b/examples/log-extension/package.json @@ -19,9 +19,9 @@ "tslint": "lb-tslint", "tslint:fix": "npm run tslint -- --fix", "pretest": "npm run clean && npm run build", - "test": "lb-mocha \"dist/test/unit/**/*.js\" \"dist/test/acceptance/**/*.js\"", + "test": "lb-mocha \"dist/__tests__/**/*.js\"", "posttest": "npm run lint", - "test:dev": "lb-mocha --allow-console-logs dist/test/**/*.js && npm run posttest", + "test:dev": "lb-mocha --allow-console-logs dist/__tests__/**/*.js && npm run posttest", "verify": "npm pack && tar xf *example-log-extension*.tgz && tree package && npm run clean" }, "repository": { diff --git a/examples/log-extension/test/acceptance/log.extension.acceptance.ts b/examples/log-extension/src/__tests__/acceptance/log.extension.acceptance.ts similarity index 100% rename from examples/log-extension/test/acceptance/log.extension.acceptance.ts rename to examples/log-extension/src/__tests__/acceptance/log.extension.acceptance.ts diff --git a/examples/log-extension/test/in-memory-logger.ts b/examples/log-extension/src/__tests__/in-memory-logger.ts similarity index 100% rename from examples/log-extension/test/in-memory-logger.ts rename to examples/log-extension/src/__tests__/in-memory-logger.ts diff --git a/examples/log-extension/test/log-spy.ts b/examples/log-extension/src/__tests__/log-spy.ts similarity index 100% rename from examples/log-extension/test/log-spy.ts rename to examples/log-extension/src/__tests__/log-spy.ts diff --git a/examples/log-extension/test/unit/decorators/log.decorator.unit.ts b/examples/log-extension/src/__tests__/unit/decorators/log.decorator.unit.ts similarity index 100% rename from examples/log-extension/test/unit/decorators/log.decorator.unit.ts rename to examples/log-extension/src/__tests__/unit/decorators/log.decorator.unit.ts diff --git a/examples/log-extension/test/unit/mixins/log.mixin.unit.ts b/examples/log-extension/src/__tests__/unit/mixins/log.mixin.unit.ts similarity index 100% rename from examples/log-extension/test/unit/mixins/log.mixin.unit.ts rename to examples/log-extension/src/__tests__/unit/mixins/log.mixin.unit.ts diff --git a/examples/log-extension/test/unit/providers/log-action.provider.unit.ts b/examples/log-extension/src/__tests__/unit/providers/log-action.provider.unit.ts similarity index 100% rename from examples/log-extension/test/unit/providers/log-action.provider.unit.ts rename to examples/log-extension/src/__tests__/unit/providers/log-action.provider.unit.ts diff --git a/examples/log-extension/test/unit/providers/timer.provider.unit.ts b/examples/log-extension/src/__tests__/unit/providers/timer.provider.unit.ts similarity index 100% rename from examples/log-extension/test/unit/providers/timer.provider.unit.ts rename to examples/log-extension/src/__tests__/unit/providers/timer.provider.unit.ts diff --git a/examples/log-extension/tsconfig.build.json b/examples/log-extension/tsconfig.build.json index f8bd0f50ef8f..6e15e4be4f6f 100644 --- a/examples/log-extension/tsconfig.build.json +++ b/examples/log-extension/tsconfig.build.json @@ -2,7 +2,7 @@ "$schema": "http://json.schemastore.org/tsconfig", "extends": "@loopback/build/config/tsconfig.common.json", "compilerOptions": { - "rootDir": "." + "rootDir": "src" }, - "include": ["index.ts", "src", "test"] + "include": ["src"] } diff --git a/examples/rpc-server/package.json b/examples/rpc-server/package.json index 422c204055c4..055c3476994c 100644 --- a/examples/rpc-server/package.json +++ b/examples/rpc-server/package.json @@ -22,9 +22,9 @@ "tslint": "lb-tslint", "tslint:fix": "npm run tslint -- --fix", "pretest": "npm run clean && npm run build", - "test": "lb-mocha dist/test", + "test": "lb-mocha dist/__tests__/**/*.js", "posttest": "npm run lint", - "test:dev": "lb-mocha --allow-console-logs dist/test/**/*.js && npm run posttest", + "test:dev": "lb-mocha --allow-console-logs dist/__tests__/**/*.js && npm run posttest", "prestart": "npm run build", "start": "node ." }, diff --git a/examples/rpc-server/test/README.md b/examples/rpc-server/src/__tests__/README.md similarity index 100% rename from examples/rpc-server/test/README.md rename to examples/rpc-server/src/__tests__/README.md diff --git a/examples/rpc-server/test/unit/controllers/greet.controller.unit.ts b/examples/rpc-server/src/__tests__/unit/controllers/greet.controller.unit.ts similarity index 95% rename from examples/rpc-server/test/unit/controllers/greet.controller.unit.ts rename to examples/rpc-server/src/__tests__/unit/controllers/greet.controller.unit.ts index ce0f5735938d..4d39e6edb57a 100644 --- a/examples/rpc-server/test/unit/controllers/greet.controller.unit.ts +++ b/examples/rpc-server/src/__tests__/unit/controllers/greet.controller.unit.ts @@ -3,7 +3,7 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -import {GreetController} from '../../../src/controllers'; +import {GreetController} from '../../../controllers'; import {expect} from '@loopback/testlab'; describe('greet.controller', () => { diff --git a/examples/rpc-server/test/unit/rpc.router.unit.ts b/examples/rpc-server/src/__tests__/unit/rpc.router.unit.ts similarity index 96% rename from examples/rpc-server/test/unit/rpc.router.unit.ts rename to examples/rpc-server/src/__tests__/unit/rpc.router.unit.ts index 4be3981cd36a..b93f95ee369c 100644 --- a/examples/rpc-server/test/unit/rpc.router.unit.ts +++ b/examples/rpc-server/src/__tests__/unit/rpc.router.unit.ts @@ -4,8 +4,8 @@ // License text available at https://opensource.org/licenses/MIT import * as express from 'express'; -import {RPCServer} from '../../src/rpc.server'; -import {routeHandler} from '../../src/rpc.router'; +import {RPCServer} from '../../rpc.server'; +import {routeHandler} from '../../rpc.router'; import {expect, sinon} from '@loopback/testlab'; describe('rpcRouter', () => { diff --git a/examples/soap-calculator/package.json b/examples/soap-calculator/package.json index fbe3d9f4c863..27818f5237bb 100644 --- a/examples/soap-calculator/package.json +++ b/examples/soap-calculator/package.json @@ -26,9 +26,9 @@ "tslint": "lb-tslint", "tslint:fix": "npm run tslint -- --fix", "pretest": "npm run clean && npm run build", - "test": "lb-mocha \"dist/test\"", + "test": "lb-mocha \"dist/__tests__/**/*.js\"", "posttest": "npm run lint", - "test:dev": "lb-mocha --allow-console-logs dist/test/**/*.js && npm run posttest", + "test:dev": "lb-mocha --allow-console-logs dist/__tests__/**/*.js && npm run posttest", "prestart": "npm run build", "start": "node ." }, diff --git a/examples/soap-calculator/test/acceptance/application.acceptance.ts b/examples/soap-calculator/src/__tests__/acceptance/application.acceptance.ts similarity index 97% rename from examples/soap-calculator/test/acceptance/application.acceptance.ts rename to examples/soap-calculator/src/__tests__/acceptance/application.acceptance.ts index 9cfb325ba0f6..e143fdf92aa3 100644 --- a/examples/soap-calculator/test/acceptance/application.acceptance.ts +++ b/examples/soap-calculator/src/__tests__/acceptance/application.acceptance.ts @@ -1,5 +1,5 @@ import {Client, createRestAppClient, expect} from '@loopback/testlab'; -import {SoapCalculatorApplication} from '../../src/application'; +import {SoapCalculatorApplication} from '../../application'; describe('Application', function() { let app: SoapCalculatorApplication; diff --git a/examples/soap-calculator/test/acceptance/home-page.acceptance.ts b/examples/soap-calculator/src/__tests__/acceptance/home-page.acceptance.ts similarity index 100% rename from examples/soap-calculator/test/acceptance/home-page.acceptance.ts rename to examples/soap-calculator/src/__tests__/acceptance/home-page.acceptance.ts diff --git a/examples/soap-calculator/test/acceptance/test-helper.ts b/examples/soap-calculator/src/__tests__/acceptance/test-helper.ts similarity index 100% rename from examples/soap-calculator/test/acceptance/test-helper.ts rename to examples/soap-calculator/src/__tests__/acceptance/test-helper.ts diff --git a/examples/soap-calculator/test/helpers.ts b/examples/soap-calculator/src/__tests__/helpers.ts similarity index 73% rename from examples/soap-calculator/test/helpers.ts rename to examples/soap-calculator/src/__tests__/helpers.ts index 52e06d404955..0890db788baf 100644 --- a/examples/soap-calculator/test/helpers.ts +++ b/examples/soap-calculator/src/__tests__/helpers.ts @@ -1,4 +1,4 @@ -import {CalculatorDataSource} from '../src/datasources/calculator.datasource'; +import {CalculatorDataSource} from '../datasources/calculator.datasource'; export async function givenAConnectedDataSource(): Promise< CalculatorDataSource diff --git a/examples/soap-calculator/test/integration/services/calculator.service.integration.ts b/examples/soap-calculator/src/__tests__/integration/services/calculator.service.integration.ts similarity index 91% rename from examples/soap-calculator/test/integration/services/calculator.service.integration.ts rename to examples/soap-calculator/src/__tests__/integration/services/calculator.service.integration.ts index 52800b1826a3..25b8ad352ecd 100644 --- a/examples/soap-calculator/test/integration/services/calculator.service.integration.ts +++ b/examples/soap-calculator/src/__tests__/integration/services/calculator.service.integration.ts @@ -1,8 +1,8 @@ import { CalculatorService, CalculatorParameters, -} from '../../../src/services/calculator.service'; -import {CalculatorServiceProvider} from '../../../src/services/calculator.service'; +} from '../../../services/calculator.service'; +import {CalculatorServiceProvider} from '../../../services/calculator.service'; import {givenAConnectedDataSource} from '../../helpers'; import {expect} from '@loopback/testlab'; diff --git a/examples/soap-calculator/src/application.ts b/examples/soap-calculator/src/application.ts index 3837da303019..e74bd58dcf7a 100644 --- a/examples/soap-calculator/src/application.ts +++ b/examples/soap-calculator/src/application.ts @@ -17,7 +17,7 @@ export class SoapCalculatorApplication extends BootMixin( this.sequence(MySequence); // Set up default home page - this.static('/', path.join(__dirname, '../../public')); + this.static('/', path.join(__dirname, '../public')); this.component(RestExplorerComponent); diff --git a/examples/soap-calculator/tsconfig.build.json b/examples/soap-calculator/tsconfig.build.json index f8bd0f50ef8f..6e15e4be4f6f 100644 --- a/examples/soap-calculator/tsconfig.build.json +++ b/examples/soap-calculator/tsconfig.build.json @@ -2,7 +2,7 @@ "$schema": "http://json.schemastore.org/tsconfig", "extends": "@loopback/build/config/tsconfig.common.json", "compilerOptions": { - "rootDir": "." + "rootDir": "src" }, - "include": ["index.ts", "src", "test"] + "include": ["src"] } diff --git a/examples/todo-list/package.json b/examples/todo-list/package.json index 4233fd01fdf7..6e555f3b491a 100644 --- a/examples/todo-list/package.json +++ b/examples/todo-list/package.json @@ -19,8 +19,8 @@ "tslint": "lb-tslint", "tslint:fix": "npm run tslint -- --fix", "pretest": "npm run build", - "test": "lb-mocha \"dist/test/*/**/*.js\"", - "test:dev": "lb-mocha --allow-console-logs dist/test/**/*.js && npm run posttest", + "test": "lb-mocha \"dist/__tests__/**/*.js\"", + "test:dev": "lb-mocha --allow-console-logs dist/__tests__/**/*.js && npm run posttest", "verify": "npm pack && tar xf loopback-todo-list*.tgz && tree package && npm run clean", "migrate": "node ./dist/src/migrate", "prestart": "npm run build", diff --git a/examples/todo-list/test/acceptance/home-page.acceptance.ts b/examples/todo-list/src/__tests__/acceptance/home-page.acceptance.ts similarity index 100% rename from examples/todo-list/test/acceptance/home-page.acceptance.ts rename to examples/todo-list/src/__tests__/acceptance/home-page.acceptance.ts diff --git a/examples/todo-list/test/acceptance/test-helper.ts b/examples/todo-list/src/__tests__/acceptance/test-helper.ts similarity index 100% rename from examples/todo-list/test/acceptance/test-helper.ts rename to examples/todo-list/src/__tests__/acceptance/test-helper.ts diff --git a/examples/todo-list/test/acceptance/todo-list-image.acceptance.ts b/examples/todo-list/src/__tests__/acceptance/todo-list-image.acceptance.ts similarity index 94% rename from examples/todo-list/test/acceptance/todo-list-image.acceptance.ts rename to examples/todo-list/src/__tests__/acceptance/todo-list-image.acceptance.ts index 7ae3a05cdb96..cf31e1911498 100644 --- a/examples/todo-list/test/acceptance/todo-list-image.acceptance.ts +++ b/examples/todo-list/src/__tests__/acceptance/todo-list-image.acceptance.ts @@ -10,12 +10,9 @@ import { givenHttpServerConfig, toJSON, } from '@loopback/testlab'; -import {TodoListApplication} from '../../src/application'; -import {TodoList, TodoListImage} from '../../src/models/'; -import { - TodoListRepository, - TodoListImageRepository, -} from '../../src/repositories/'; +import {TodoListApplication} from '../../application'; +import {TodoList, TodoListImage} from '../../models/'; +import {TodoListRepository, TodoListImageRepository} from '../../repositories/'; import {givenTodoListImage, givenTodoList} from '../helpers'; describe('TodoListApplication', () => { diff --git a/examples/todo-list/test/acceptance/todo-list-todo.acceptance.ts b/examples/todo-list/src/__tests__/acceptance/todo-list-todo.acceptance.ts similarity index 97% rename from examples/todo-list/test/acceptance/todo-list-todo.acceptance.ts rename to examples/todo-list/src/__tests__/acceptance/todo-list-todo.acceptance.ts index ad3368626074..df5d7d9e3ff3 100644 --- a/examples/todo-list/test/acceptance/todo-list-todo.acceptance.ts +++ b/examples/todo-list/src/__tests__/acceptance/todo-list-todo.acceptance.ts @@ -10,9 +10,9 @@ import { givenHttpServerConfig, toJSON, } from '@loopback/testlab'; -import {TodoListApplication} from '../../src/application'; -import {Todo, TodoList} from '../../src/models/'; -import {TodoListRepository, TodoRepository} from '../../src/repositories/'; +import {TodoListApplication} from '../../application'; +import {Todo, TodoList} from '../../models/'; +import {TodoListRepository, TodoRepository} from '../../repositories/'; import {givenTodo, givenTodoList} from '../helpers'; describe('TodoListApplication', () => { diff --git a/examples/todo-list/test/acceptance/todo-list.acceptance.ts b/examples/todo-list/src/__tests__/acceptance/todo-list.acceptance.ts similarity index 97% rename from examples/todo-list/test/acceptance/todo-list.acceptance.ts rename to examples/todo-list/src/__tests__/acceptance/todo-list.acceptance.ts index 03d6d39ca21b..8c3ad47df6a4 100644 --- a/examples/todo-list/test/acceptance/todo-list.acceptance.ts +++ b/examples/todo-list/src/__tests__/acceptance/todo-list.acceptance.ts @@ -11,9 +11,9 @@ import { givenHttpServerConfig, toJSON, } from '@loopback/testlab'; -import {TodoListApplication} from '../../src/application'; -import {TodoList} from '../../src/models/'; -import {TodoListRepository} from '../../src/repositories/'; +import {TodoListApplication} from '../../application'; +import {TodoList} from '../../models/'; +import {TodoListRepository} from '../../repositories/'; import {givenTodoList} from '../helpers'; describe('TodoListApplication', () => { diff --git a/examples/todo-list/test/acceptance/todo.acceptance.ts b/examples/todo-list/src/__tests__/acceptance/todo.acceptance.ts similarity index 96% rename from examples/todo-list/test/acceptance/todo.acceptance.ts rename to examples/todo-list/src/__tests__/acceptance/todo.acceptance.ts index f95a3f056859..359a5307bb1e 100644 --- a/examples/todo-list/test/acceptance/todo.acceptance.ts +++ b/examples/todo-list/src/__tests__/acceptance/todo.acceptance.ts @@ -11,9 +11,9 @@ import { givenHttpServerConfig, toJSON, } from '@loopback/testlab'; -import {TodoListApplication} from '../../src/application'; -import {Todo, TodoList} from '../../src/models/'; -import {TodoRepository, TodoListRepository} from '../../src/repositories/'; +import {TodoListApplication} from '../../application'; +import {Todo, TodoList} from '../../models/'; +import {TodoRepository, TodoListRepository} from '../../repositories/'; import {givenTodo, givenTodoList} from '../helpers'; describe('TodoListApplication', () => { diff --git a/examples/todo-list/test/helpers.ts b/examples/todo-list/src/__tests__/helpers.ts similarity index 97% rename from examples/todo-list/test/helpers.ts rename to examples/todo-list/src/__tests__/helpers.ts index 691166745df9..37deec1abfa6 100644 --- a/examples/todo-list/test/helpers.ts +++ b/examples/todo-list/src/__tests__/helpers.ts @@ -3,7 +3,7 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -import {Todo, TodoList, TodoListImage} from '../src/models'; +import {Todo, TodoList, TodoListImage} from '../models'; /* ============================================================================== diff --git a/examples/todo-list/test/unit/controllers/todo-list-todo.controller.unit.ts b/examples/todo-list/src/__tests__/unit/controllers/todo-list-todo.controller.unit.ts similarity index 96% rename from examples/todo-list/test/unit/controllers/todo-list-todo.controller.unit.ts rename to examples/todo-list/src/__tests__/unit/controllers/todo-list-todo.controller.unit.ts index 4ee036826651..1c607e0cb3aa 100644 --- a/examples/todo-list/test/unit/controllers/todo-list-todo.controller.unit.ts +++ b/examples/todo-list/src/__tests__/unit/controllers/todo-list-todo.controller.unit.ts @@ -13,9 +13,9 @@ import { sinon, StubbedInstanceWithSinonAccessor, } from '@loopback/testlab'; -import {TodoListTodoController} from '../../../src/controllers'; -import {Todo, TodoList} from '../../../src/models'; -import {TodoListRepository} from '../../../src/repositories'; +import {TodoListTodoController} from '../../../controllers'; +import {Todo, TodoList} from '../../../models'; +import {TodoListRepository} from '../../../repositories'; import {givenTodo, givenTodoList} from '../../helpers'; describe('TodoController', () => { diff --git a/examples/todo-list/test/unit/controllers/todo-list.controller.unit.ts b/examples/todo-list/src/__tests__/unit/controllers/todo-list.controller.unit.ts similarity index 96% rename from examples/todo-list/test/unit/controllers/todo-list.controller.unit.ts rename to examples/todo-list/src/__tests__/unit/controllers/todo-list.controller.unit.ts index cd415a8a03e6..e66569025618 100644 --- a/examples/todo-list/test/unit/controllers/todo-list.controller.unit.ts +++ b/examples/todo-list/src/__tests__/unit/controllers/todo-list.controller.unit.ts @@ -9,9 +9,9 @@ import { sinon, StubbedInstanceWithSinonAccessor, } from '@loopback/testlab'; -import {TodoListController} from '../../../src/controllers'; -import {TodoList} from '../../../src/models'; -import {TodoListRepository} from '../../../src/repositories'; +import {TodoListController} from '../../../controllers'; +import {TodoList} from '../../../models'; +import {TodoListRepository} from '../../../repositories'; import {givenTodoList} from '../../helpers'; describe('TodoController', () => { diff --git a/examples/todo-list/test/unit/controllers/todo.controller.unit.ts b/examples/todo-list/src/__tests__/unit/controllers/todo.controller.unit.ts similarity index 96% rename from examples/todo-list/test/unit/controllers/todo.controller.unit.ts rename to examples/todo-list/src/__tests__/unit/controllers/todo.controller.unit.ts index c331caeceab5..bdf52ca0410d 100644 --- a/examples/todo-list/test/unit/controllers/todo.controller.unit.ts +++ b/examples/todo-list/src/__tests__/unit/controllers/todo.controller.unit.ts @@ -9,9 +9,9 @@ import { sinon, StubbedInstanceWithSinonAccessor, } from '@loopback/testlab'; -import {TodoController} from '../../../src/controllers'; -import {Todo} from '../../../src/models'; -import {TodoRepository} from '../../../src/repositories'; +import {TodoController} from '../../../controllers'; +import {Todo} from '../../../models'; +import {TodoRepository} from '../../../repositories'; import {givenTodo} from '../../helpers'; describe('TodoController', () => { diff --git a/examples/todo-list/src/application.ts b/examples/todo-list/src/application.ts index 9df34019d3ca..beff3668e950 100644 --- a/examples/todo-list/src/application.ts +++ b/examples/todo-list/src/application.ts @@ -21,7 +21,7 @@ export class TodoListApplication extends BootMixin( this.sequence(MySequence); // Set up default home page - this.static('/', path.join(__dirname, '../../public')); + this.static('/', path.join(__dirname, '../public')); this.component(RestExplorerComponent); diff --git a/examples/todo-list/tsconfig.build.json b/examples/todo-list/tsconfig.build.json index f8bd0f50ef8f..d0cbe282ad53 100644 --- a/examples/todo-list/tsconfig.build.json +++ b/examples/todo-list/tsconfig.build.json @@ -4,5 +4,5 @@ "compilerOptions": { "rootDir": "." }, - "include": ["index.ts", "src", "test"] + "include": ["src"] } diff --git a/examples/todo/package.json b/examples/todo/package.json index 8382ffb7a361..2c6f6177f09f 100644 --- a/examples/todo/package.json +++ b/examples/todo/package.json @@ -19,8 +19,8 @@ "tslint": "lb-tslint", "tslint:fix": "npm run tslint -- --fix", "pretest": "npm run build", - "test": "lb-mocha \"dist/test/*/**/*.js\"", - "test:dev": "lb-mocha --allow-console-logs dist/test/**/*.js && npm run posttest", + "test": "lb-mocha \"dist/__tests__/**/*.js\"", + "test:dev": "lb-mocha --allow-console-logs dist/__tests__/**/*.js && npm run posttest", "verify": "npm pack && tar xf loopback-todo*.tgz && tree package && npm run clean", "migrate": "node ./dist/src/migrate", "prestart": "npm run build", diff --git a/examples/todo/test/acceptance/home-page.acceptance.ts b/examples/todo/src/__tests__/acceptance/home-page.acceptance.ts similarity index 100% rename from examples/todo/test/acceptance/home-page.acceptance.ts rename to examples/todo/src/__tests__/acceptance/home-page.acceptance.ts diff --git a/examples/todo/test/acceptance/test-helper.ts b/examples/todo/src/__tests__/acceptance/test-helper.ts similarity index 100% rename from examples/todo/test/acceptance/test-helper.ts rename to examples/todo/src/__tests__/acceptance/test-helper.ts diff --git a/examples/todo/test/acceptance/todo.acceptance.ts b/examples/todo/src/__tests__/acceptance/todo.acceptance.ts similarity index 97% rename from examples/todo/test/acceptance/todo.acceptance.ts rename to examples/todo/src/__tests__/acceptance/todo.acceptance.ts index ab2b34097fcc..2dd81a399bf0 100644 --- a/examples/todo/test/acceptance/todo.acceptance.ts +++ b/examples/todo/src/__tests__/acceptance/todo.acceptance.ts @@ -11,9 +11,9 @@ import { givenHttpServerConfig, toJSON, } from '@loopback/testlab'; -import {TodoListApplication} from '../../src/application'; -import {Todo} from '../../src/models/'; -import {TodoRepository} from '../../src/repositories/'; +import {TodoListApplication} from '../../application'; +import {Todo} from '../../models/'; +import {TodoRepository} from '../../repositories/'; import { aLocation, getProxiedGeoCoderConfig, diff --git a/examples/todo/test/helpers.ts b/examples/todo/src/__tests__/helpers.ts similarity index 92% rename from examples/todo/test/helpers.ts rename to examples/todo/src/__tests__/helpers.ts index 754d597d993c..245e0700bd65 100644 --- a/examples/todo/test/helpers.ts +++ b/examples/todo/src/__tests__/helpers.ts @@ -6,9 +6,9 @@ import {HttpCachingProxy} from '@loopback/http-caching-proxy'; import {merge} from 'lodash'; import * as path from 'path'; -import {Todo} from '../src/models/index'; -import {GeoPoint} from '../src/services/geocoder.service'; -import * as GEO_CODER_CONFIG from '../src/datasources/geocoder.datasource.json'; +import {Todo} from '../models/index'; +import {GeoPoint} from '../services/geocoder.service'; +import * as GEO_CODER_CONFIG from '../datasources/geocoder.datasource.json'; /* ============================================================================== diff --git a/examples/todo/test/integration/services/geocoder.service.integration.ts b/examples/todo/src/__tests__/integration/services/geocoder.service.integration.ts similarity index 92% rename from examples/todo/test/integration/services/geocoder.service.integration.ts rename to examples/todo/src/__tests__/integration/services/geocoder.service.integration.ts index 5e6be6a7ed37..314235c83bff 100644 --- a/examples/todo/test/integration/services/geocoder.service.integration.ts +++ b/examples/todo/src/__tests__/integration/services/geocoder.service.integration.ts @@ -4,13 +4,13 @@ // License text available at https://opensource.org/licenses/MIT import {expect} from '@loopback/testlab'; -import {GeocoderService, GeocoderServiceProvider} from '../../../src/services'; +import {GeocoderService, GeocoderServiceProvider} from '../../../services'; import { HttpCachingProxy, givenCachingProxy, getProxiedGeoCoderConfig, } from '../../helpers'; -import {GeocoderDataSource} from '../../../src/datasources/geocoder.datasource'; +import {GeocoderDataSource} from '../../../datasources/geocoder.datasource'; describe('GeoLookupService', function() { // tslint:disable-next-line:no-invalid-this diff --git a/examples/todo/test/unit/controllers/todo.controller.unit.ts b/examples/todo/src/__tests__/unit/controllers/todo.controller.unit.ts similarity index 95% rename from examples/todo/test/unit/controllers/todo.controller.unit.ts rename to examples/todo/src/__tests__/unit/controllers/todo.controller.unit.ts index 06141cb8a9f9..9b442b0fca62 100644 --- a/examples/todo/test/unit/controllers/todo.controller.unit.ts +++ b/examples/todo/src/__tests__/unit/controllers/todo.controller.unit.ts @@ -10,10 +10,10 @@ import { sinon, StubbedInstanceWithSinonAccessor, } from '@loopback/testlab'; -import {TodoController} from '../../../src/controllers'; -import {Todo} from '../../../src/models/index'; -import {TodoRepository} from '../../../src/repositories'; -import {GeocoderService} from '../../../src/services'; +import {TodoController} from '../../../controllers'; +import {Todo} from '../../../models/index'; +import {TodoRepository} from '../../../repositories'; +import {GeocoderService} from '../../../services'; import {aLocation, givenTodo} from '../../helpers'; describe('TodoController', () => { diff --git a/examples/todo/src/application.ts b/examples/todo/src/application.ts index 8f2af45bd508..879521b6a13f 100644 --- a/examples/todo/src/application.ts +++ b/examples/todo/src/application.ts @@ -22,7 +22,7 @@ export class TodoListApplication extends BootMixin( this.sequence(MySequence); // Set up default home page - this.static('/', path.join(__dirname, '../../public')); + this.static('/', path.join(__dirname, '../public')); this.component(RestExplorerComponent); diff --git a/examples/todo/tsconfig.build.json b/examples/todo/tsconfig.build.json index f8bd0f50ef8f..6e15e4be4f6f 100644 --- a/examples/todo/tsconfig.build.json +++ b/examples/todo/tsconfig.build.json @@ -2,7 +2,7 @@ "$schema": "http://json.schemastore.org/tsconfig", "extends": "@loopback/build/config/tsconfig.common.json", "compilerOptions": { - "rootDir": "." + "rootDir": "src" }, - "include": ["index.ts", "src", "test"] + "include": ["src"] } diff --git a/package.json b/package.json index 50a67225a34f..be0df2303a3c 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "test:ci": "node packages/build/bin/run-nyc npm run mocha --scripts-prepend-node-path", "verify:docs": "npm run build:site -- --verify", "build:site": "./bin/build-docs-site.sh", - "mocha": "node packages/build/bin/run-mocha \"packages/*/dist/test/**/*.js\" \"packages/*/dist/__tests__/**/*.js\" \"examples/*/dist/test/**/*.js\" \"packages/cli/test/**/*.js\" \"packages/build/test/*/*.js\"", + "mocha": "node packages/build/bin/run-mocha \"packages/*/dist/test/**/*.js\" \"packages/*/dist/__tests__/**/*.js\" \"examples/*/dist/__tests__/**/*.js\" \"packages/cli/test/**/*.js\" \"packages/build/test/*/*.js\"", "posttest": "npm run lint" }, "config": {