Starter/TypeScript-Node-Starter
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript-Node-Starter.git synced 2025-11-08 16:17:37 +00:00
Code Issues Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Bowden
2017-12-14 12:41:28 -08:00
parent 75d72df881 e21f04452e
commit e7e0bb7c7c
6 changed files with 158 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/api.test.ts
View File

@@ -1,7 +1,5 @@
import * as supertest from "supertest";
const app = require("../src/app");
const request = supertest(app);
import * as app from "../src/server";
describe("GET /api", () => {
const request = supertest(app);

11
test/app.test.ts
View File

@@ -1,10 +1,11 @@
import * as supertest from "supertest";
const app = require("../src/app");
const request = supertest(app);
import * as app from "../src/server";
describe("GET /random-url", () => {
it("should return 404", () => {
return request.get("/reset")
.expect(404);
const request = supertest(app);
it("should return 404", (done) => {
request.get("/reset")
.expect(404, done);
});
});

11
test/contact.test.ts
View File

@@ -1,10 +1,11 @@
import * as supertest from "supertest";
const app = require("../src/app");
const request = supertest(app);
import * as app from "../src/server";
describe("GET /contact", () => {
it("should return 200 OK", () => {
return request.get("/contact")
.expect(200);
const request = supertest(app);
it("should return 200 OK", (done) => {
request.get("/contact")
.expect(200, done);
});
});

11
test/home.test.ts
View File

@@ -1,10 +1,11 @@
import * as supertest from "supertest";
const app = require("../src/app");
const request = supertest(app);
import * as app from "../src/server";
describe("GET /", () => {
it("should return 200 OK", () => {
return request.get("/")
.expect(200);
const request = supertest(app);
it("should return 200 OK", (done) => {
request.get("/")
.expect(200, done);
});
});

3
test/user.test.ts
View File

@@ -1,5 +1,6 @@
import * as supertest from "supertest";
const app = require("../src/app");
import * as app from "../src/server";
const request = supertest(app);
describe("GET /login", () => {