mirror of
https://github.com/outline/outline.git
synced 2026-11-21 21:44:30 +03:00
fix: pull TestServer into a separate file
This commit is contained in:
1 parent
4d922173de
commit
15531a5214
2 files changed
+85
-82
No files matched your search
@@ -0,0 +1,84 @@
|
||||
import http from "http";
|
||||
import { AddressInfo } from "net";
|
||||
import Koa from "koa";
|
||||
// eslint-disable-next-line no-restricted-imports
|
||||
import nodeFetch from "node-fetch";
|
||||
|
||||
class TestServer {
|
||||
private server: http.Server;
|
||||
private listener?: Promise<void> | null;
|
||||
|
||||
constructor(app: Koa) {
|
||||
this.server = http.createServer(app.callback() as any);
|
||||
}
|
||||
|
||||
get address(): string {
|
||||
const { port } = this.server.address() as AddressInfo;
|
||||
return `http://localhost:${port}`;
|
||||
}
|
||||
|
||||
listen() {
|
||||
if (!this.listener) {
|
||||
this.listener = new Promise((resolve, reject) => {
|
||||
this.server
|
||||
.listen(0, () => resolve())
|
||||
.on("error", (err) => reject(err));
|
||||
});
|
||||
}
|
||||
|
||||
return this.listener;
|
||||
}
|
||||
|
||||
fetch(path: string, opts: any) {
|
||||
return this.listen().then(() => {
|
||||
const url = `${this.address}${path}`;
|
||||
const options = Object.assign({ headers: {} }, opts);
|
||||
const contentType =
|
||||
options.headers["Content-Type"] ?? options.headers["content-type"];
|
||||
// automatic JSON encoding
|
||||
if (!contentType && typeof options.body === "object") {
|
||||
options.headers["Content-Type"] = "application/json";
|
||||
options.body = JSON.stringify(options.body);
|
||||
}
|
||||
|
||||
return nodeFetch(url, options);
|
||||
});
|
||||
}
|
||||
|
||||
close() {
|
||||
this.listener = null;
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
this.server.close((err) => (err ? reject(err) : resolve()));
|
||||
});
|
||||
}
|
||||
|
||||
delete(path: string, options?: any) {
|
||||
return this.fetch(path, { ...options, method: "DELETE" });
|
||||
}
|
||||
|
||||
get(path: string, options?: any) {
|
||||
return this.fetch(path, { ...options, method: "GET" });
|
||||
}
|
||||
|
||||
head(path: string, options?: any) {
|
||||
return this.fetch(path, { ...options, method: "HEAD" });
|
||||
}
|
||||
|
||||
options(path: string, options?: any) {
|
||||
return this.fetch(path, { ...options, method: "OPTIONS" });
|
||||
}
|
||||
|
||||
patch(path: string, options?: any) {
|
||||
return this.fetch(path, { ...options, method: "PATCH" });
|
||||
}
|
||||
|
||||
post(path: string, options?: any) {
|
||||
return this.fetch(path, { ...options, method: "POST" });
|
||||
}
|
||||
|
||||
put(path: string, options?: any) {
|
||||
return this.fetch(path, { ...options, method: "PUT" });
|
||||
}
|
||||
}
|
||||
|
||||
export default TestServer;
|
||||
+1
-82
@@ -1,8 +1,3 @@
|
||||
import http from "http";
|
||||
import { AddressInfo } from "net";
|
||||
import Koa from "koa";
|
||||
// eslint-disable-next-line no-restricted-imports
|
||||
import nodeFetch from "node-fetch";
|
||||
import { WhereOptions } from "sequelize";
|
||||
import sharedEnv from "@shared/env";
|
||||
import env from "@server/env";
|
||||
@@ -10,83 +5,7 @@ import { Event, Team } from "@server/models";
|
||||
import onerror from "@server/onerror";
|
||||
import webService from "@server/services/web";
|
||||
import { sequelize } from "@server/storage/database";
|
||||
|
||||
class TestServer {
|
||||
private server: http.Server;
|
||||
private listener?: Promise<void> | null;
|
||||
|
||||
constructor(app: Koa) {
|
||||
this.server = http.createServer(app.callback() as any);
|
||||
}
|
||||
|
||||
get address(): string {
|
||||
const { port } = this.server.address() as AddressInfo;
|
||||
return `http://localhost:${port}`;
|
||||
}
|
||||
|
||||
listen() {
|
||||
if (!this.listener) {
|
||||
this.listener = new Promise((resolve, reject) => {
|
||||
this.server
|
||||
.listen(0, () => resolve())
|
||||
.on("error", (err) => reject(err));
|
||||
});
|
||||
}
|
||||
|
||||
return this.listener;
|
||||
}
|
||||
|
||||
fetch(path: string, opts: any) {
|
||||
return this.listen().then(() => {
|
||||
const url = `${this.address}${path}`;
|
||||
const options = Object.assign({ headers: {} }, opts);
|
||||
const contentType =
|
||||
options.headers["Content-Type"] ?? options.headers["content-type"];
|
||||
// automatic JSON encoding
|
||||
if (!contentType && typeof options.body === "object") {
|
||||
options.headers["Content-Type"] = "application/json";
|
||||
options.body = JSON.stringify(options.body);
|
||||
}
|
||||
|
||||
return nodeFetch(url, options);
|
||||
});
|
||||
}
|
||||
|
||||
close() {
|
||||
this.listener = null;
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
this.server.close((err) => (err ? reject(err) : resolve()));
|
||||
});
|
||||
}
|
||||
|
||||
delete(path: string, options?: any) {
|
||||
return this.fetch(path, { ...options, method: "DELETE" });
|
||||
}
|
||||
|
||||
get(path: string, options?: any) {
|
||||
return this.fetch(path, { ...options, method: "GET" });
|
||||
}
|
||||
|
||||
head(path: string, options?: any) {
|
||||
return this.fetch(path, { ...options, method: "HEAD" });
|
||||
}
|
||||
|
||||
options(path: string, options?: any) {
|
||||
return this.fetch(path, { ...options, method: "OPTIONS" });
|
||||
}
|
||||
|
||||
patch(path: string, options?: any) {
|
||||
return this.fetch(path, { ...options, method: "PATCH" });
|
||||
}
|
||||
|
||||
post(path: string, options?: any) {
|
||||
return this.fetch(path, { ...options, method: "POST" });
|
||||
}
|
||||
|
||||
put(path: string, options?: any) {
|
||||
return this.fetch(path, { ...options, method: "PUT" });
|
||||
}
|
||||
}
|
||||
import TestServer from "./TestServer";
|
||||
|
||||
export function getTestServer() {
|
||||
const app = webService();
|
||||
|
||||
Reference in new issue
Block a user