Merge pull request nestjs#2816 from nestjs/6.6.0

chore() minor release [6.6.0]

Author: kamilmysliwiec

.circleci/config.yml

@@ -1,4 +1,31 @@
 version: 2
+
+aliases:
+  - &restore-cache
+    restore_cache:
+        key: dependency-cache-{{ checksum "package.json" }}
+  - &install-deps
+    run:
+        name: Install dependencies
+        command: npm ci
+  - &build-packages
+    run:
+        name: Build
+        command: npm run build
+  - &run-unit-tests
+    run:
+        name: Test
+        command: npm run test
+
+unit-tests-template: &unit-tests-template
+  working_directory: ~/nest
+  steps:
+    - checkout
+    - *restore-cache
+    - *install-deps
+    - *build-packages
+    - *run-unit-tests
+
 jobs:
   build:
     working_directory: ~/nest
@@ -22,47 +49,112 @@ jobs:
           name: Build
           command: npm run build
 
-  test:
+  test_node_12:
     working_directory: ~/nest
     docker:
       - image: circleci/node:12
     steps:
       - checkout
-      - restore_cache:
-          name: Restore node_modules cache
-          key: dependency-cache-{{ checksum "package.json" }}
-      - run:
-          name: Install dependencies
-          command: npm ci
+      - *restore-cache
+      - *install-deps
+      - *build-packages
+      - *run-unit-tests
       - run:
-          name: Build (dev)
-          command: npm run build
-      - run:
-          name: Test
-          command: npm run test
+          name: Collect coverage
+          command: npm run coverage
+      - store_artifacts:
+          path: coverage
+
+  test_node_10:
+    <<: *unit-tests-template
+    docker:
+      - image: circleci/node:10
+
+  test_node_8:
+    <<: *unit-tests-template
+    docker:
+      - image: circleci/node:8
+
   lint:
     working_directory: ~/nest
     docker:
       - image: circleci/node:12
     steps:
       - checkout
-      - restore_cache:
-          name: Restore node_modules cache
-          key: dependency-cache-{{ checksum "package.json" }}
-      - run:
-          name: Install dependencies
-          command: npm ci
+      - *restore-cache
+      - *install-deps
       - run:
           name: Lint
           command: npm run lint
+
+  integration_tests:
+    working_directory: ~/nest
+    machine: true
+    steps:
+      - checkout
+      - run: 
+          name: Prepare nvm
+          command: |
+            echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
+            echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
+      - run: 
+          name: Upgrade Node.js
+          command: |
+            nvm install v12
+            node -v
+            nvm alias default v12
+      - run:
+          name: Install Docker Compose
+          command: |
+            curl -L https://github.com/docker/compose/releases/download/1.19.0/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
+            chmod +x ~/docker-compose
+            sudo mv ~/docker-compose /usr/local/bin/docker-compose
+      - *install-deps
+      - run:
+          name: Prepare tests
+          command: |
+            bash ./scripts/prepare.sh
+            sleep 10
+      - run:
+          name: List containers
+          command: docker ps
+      - run:
+          name: Integration tests
+          command: npm run integration-test
+
+  samples:
+    working_directory: ~/nest
+    docker:
+      - image: circleci/node:12
+    steps:
+      - checkout
+      - *restore-cache
+      - *install-deps
+      - run:
+          name: Build all samples
+          command: npm run build:samples
+
 workflows:
   version: 2
   build-and-test:
     jobs:
       - build
-      - test:
+      - test_node_12:
+          requires:
+            - build
+      - test_node_10:
+          requires:
+            - build
+      - test_node_8:
           requires:
             - build
       - lint:
           requires:
             - build
+      - integration_tests:
+          requires:
+            - build
+      - samples:
+          requires:
+            - build
+      

.travis.yml

@@ -2,18 +2,15 @@
   <a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo_text.svg" width="320" alt="Nest Logo" /></a>
 </p>
 
-[travis-image]: https://api.travis-ci.org/nestjs/nest.svg?branch=master
-[travis-url]: https://travis-ci.org/nestjs/nest
-[linux-image]: https://img.shields.io/travis/nestjs/nest/master.svg?label=linux
-[linux-url]: https://travis-ci.org/nestjs/nest
+[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
+[circleci-url]: https://circleci.com/gh/nestjs/nest
 
   <p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
     <p align="center">
 <a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
 <a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>
 <a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/dm/@nestjs/core.svg" alt="NPM Downloads" /></a>
-<a href="https://travis-ci.org/nestjs/nest" target="_blank"><img src="https://api.travis-ci.org/nestjs/nest.svg?branch=master" alt="Travis" /></a>
-<a href="https://travis-ci.org/nestjs/nest" target="_blank"><img src="https://img.shields.io/travis/nestjs/nest/master.svg?label=linux" alt="Linux" /></a>
+<a href="https://circleci.com/gh/nestjs/nest" target="_blank"><img src="https://img.shields.io/circleci/build/github/nestjs/nest/master" alt="CircleCI" /></a>
 <a href="https://coveralls.io/github/nestjs/nest?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#9" alt="Coverage" /></a>
 <a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
 <a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>

Readme.md

@@ -0,0 +1,59 @@
+import { INestApplication, MiddlewareConsumer, Module } from '@nestjs/common';
+import { Test } from '@nestjs/testing';
+import * as request from 'supertest';
+
+const RETURN_VALUE_A = 'test_A';
+const RETURN_VALUE_B = 'test_B';
+
+@Module({
+  imports: [],
+})
+class ModuleA {
+  configure(consumer: MiddlewareConsumer) {
+    consumer
+      .apply((req, res, next) => {
+        res.send(RETURN_VALUE_A);
+      })
+      .forRoutes('hello');
+  }
+}
+
+@Module({
+  imports: [ModuleA],
+})
+class ModuleB {
+  configure(consumer: MiddlewareConsumer) {
+    consumer
+      .apply((req, res, next) => {
+        res.send(RETURN_VALUE_B);
+      })
+      .forRoutes('hello');
+  }
+}
+
+@Module({
+  imports: [ModuleB],
+})
+class TestModule {}
+
+describe('Middleware (execution order)', () => {
+  let app: INestApplication;
+
+  beforeEach(async () => {
+    app = (await Test.createTestingModule({
+      imports: [TestModule],
+    }).compile()).createNestApplication();
+
+    await app.init();
+  });
+
+  it(`should execute middleware of dependent modules first `, () => {
+    return request(app.getHttpServer())
+      .get('/hello')
+      .expect(200, RETURN_VALUE_A);
+  });
+
+  afterEach(async () => {
+    await app.close();
+  });
+});

integration/hello-world/e2e/middleware-execute-order.spec.ts

@@ -0,0 +1,55 @@
+import { Injectable, BeforeApplicationShutdown } from '@nestjs/common';
+import { Test } from '@nestjs/testing';
+import { expect } from 'chai';
+import * as Sinon from 'sinon';
+
+@Injectable()
+class TestInjectable implements BeforeApplicationShutdown {
+  beforeApplicationShutdown = Sinon.spy();
+}
+
+describe('BeforeApplicationShutdown', () => {
+  it('should call `beforeApplicationShutdown` when application closes', async () => {
+    const module = await Test.createTestingModule({
+      providers: [TestInjectable],
+    }).compile();
+
+    const app = module.createNestApplication();
+    await app.close();
+    const instance = module.get(TestInjectable);
+    expect(instance.beforeApplicationShutdown.called).to.be.true;
+  });
+
+  it('should not stop the server once beforeApplicationShutdown has been called', async () => {
+    let resolve;
+    const promise = new Promise(r => (resolve = r));
+    const module = await Test.createTestingModule({
+      providers: [
+        {
+          provide: 'Test',
+          useValue: {
+            beforeApplicationShutdown: () => promise,
+          },
+        },
+      ],
+    }).compile();
+    Sinon.stub(module, 'dispose' as any);
+    const app = module.createNestApplication();
+
+    app.close();
+
+    expect(((module as any).dispose as Sinon.SinonSpy).called, 'dispose')
+      .to.be.false;
+
+    resolve();
+
+    setTimeout(
+      () =>
+        expect(
+          ((module as any).dispose as Sinon.SinonSpy).called,
+          'dispose',
+        ).to.be.true,
+      0,
+    );
+  });
+});