From 14b42280e836c9db209e656187182d60d238a279 Mon Sep 17 00:00:00 2001 From: "kamil.mysliwiec" Date: Sun, 5 Feb 2017 23:10:43 +0100 Subject: [PATCH] Travis integration & example --- .gitignore | 1 - .travis.yml | 2 +- example/app.ts | 13 +++++++++++++ example/modules/app.module.ts | 7 +++++++ example/modules/users/users-query.service.ts | 4 ++++ example/modules/users/users.module.ts | 9 +++++++++ example/modules/users/users.route.ts | 16 ++++++++++++++++ example/server.ts | 5 +++++ karma.conf.js | 6 +++--- package.json | 1 + 10 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 example/app.ts create mode 100644 example/modules/app.module.ts create mode 100644 example/modules/users/users-query.service.ts create mode 100644 example/modules/users/users.module.ts create mode 100644 example/modules/users/users.route.ts create mode 100644 example/server.ts diff --git a/.gitignore b/.gitignore index 90a2b7270..4453f1c6a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,4 @@ npm-debug.log # example -/example /quick-start \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index d793e1ece..2d992cb78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,4 +7,4 @@ before_install: - sh -e /etc/init.d/xvfb start script: - npm test - - npm run build \ No newline at end of file + - npm run compile \ No newline at end of file diff --git a/example/app.ts b/example/app.ts new file mode 100644 index 000000000..21747d2b8 --- /dev/null +++ b/example/app.ts @@ -0,0 +1,13 @@ +import { NestApplication } from "./../src/"; + +export class Application implements NestApplication { + + constructor(private app) {} + + start() { + this.app.listen(3030, () => { + console.log("Application listen on port:", 3030); + }); + } + +} \ No newline at end of file diff --git a/example/modules/app.module.ts b/example/modules/app.module.ts new file mode 100644 index 000000000..efb5269f1 --- /dev/null +++ b/example/modules/app.module.ts @@ -0,0 +1,7 @@ +import { UsersModule } from "./users/users.module"; +import { Module } from "./../../src/"; + +@Module({ + modules: [ UsersModule ] +}) +export class ApplicationModule {} \ No newline at end of file diff --git a/example/modules/users/users-query.service.ts b/example/modules/users/users-query.service.ts new file mode 100644 index 000000000..d99d92572 --- /dev/null +++ b/example/modules/users/users-query.service.ts @@ -0,0 +1,4 @@ +import { Component } from "./../../../src/"; + +@Component() +export class UsersQueryService {} \ No newline at end of file diff --git a/example/modules/users/users.module.ts b/example/modules/users/users.module.ts new file mode 100644 index 000000000..cb0041d02 --- /dev/null +++ b/example/modules/users/users.module.ts @@ -0,0 +1,9 @@ +import { UsersRoute } from "./users.route"; +import { UsersQueryService } from "./users-query.service"; +import { Module } from "./../../../src/"; + +@Module({ + controllers: [ UsersRoute ], + components: [ UsersQueryService ] +}) +export class UsersModule {} \ No newline at end of file diff --git a/example/modules/users/users.route.ts b/example/modules/users/users.route.ts new file mode 100644 index 000000000..7471779c0 --- /dev/null +++ b/example/modules/users/users.route.ts @@ -0,0 +1,16 @@ +import { Request, Response, NextFunction } from "express"; +import { UsersQueryService } from "./users-query.service"; +import { RequestMethod, Controller, RequestMapping } from "./../../../src/"; + +@Controller({ path: "users" }) +export class UsersRoute { + + constructor(private usersQueryService: UsersQueryService) {} + + @RequestMapping({ + path: "/", + method: RequestMethod.GET + }) + getAllUsers(req: Request, res: Response, next: NextFunction) {} +} + diff --git a/example/server.ts b/example/server.ts new file mode 100644 index 000000000..b0e1c0348 --- /dev/null +++ b/example/server.ts @@ -0,0 +1,5 @@ +import { NestRunner } from "./../src/"; +import { Application } from "./app"; +import { ApplicationModule } from "./modules/app.module"; + +NestRunner.run(Application, ApplicationModule); \ No newline at end of file diff --git a/karma.conf.js b/karma.conf.js index 1a1eeca1f..fd91e5ae8 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -3,7 +3,7 @@ const webpackConfig = require('./webpack.config.test'); module.exports = function (config) { config.set({ - browsers: [ 'Chrome', 'ChromeCanary' ], + browsers: [ 'Firefox' ], colors: true, reporters: [ 'mocha' ], frameworks: [ 'mocha', 'chai', 'sinon' ], @@ -14,12 +14,12 @@ module.exports = function (config) { 'tests.webpack.js': [ 'webpack' ] }, webpack: webpackConfig, - customLaunchers: { + /*customLaunchers: { Chrome_travis_ci: { base: 'Chrome', flags: ['--no-sandbox'] } - }, + },*/ singleRun: true }); diff --git a/package.json b/package.json index aa68179d3..bcd11a51e 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "karma-chai": "^0.1.0", "karma-chrome-launcher": "^2.0.0", "karma-coverage": "^1.1.1", + "karma-firefox-launcher": "^1.0.0", "karma-mocha": "^1.3.0", "karma-mocha-reporter": "^2.2.2", "karma-sinon": "^1.0.5",