Archived
1
0

Revert "refactor: move test-plugin to integration suite"

This reverts commit bc02005dc0.

I couldn't get past some GLIBC errors in CI so moving back to unit
tests.
This commit is contained in:
Joe Previte 2022-09-21 12:13:15 -07:00
parent 9a1cd349a1
commit 7d43eaac95
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
13 changed files with 20 additions and 19 deletions

View File

@ -24,11 +24,6 @@ main() {
path="$CODE_SERVER_PATH"
fi
echo "Building test plugin"
pushd test/integration/test-plugin
make -s out/index.js
popd
echo "Running tests with code-server binary: '$path'"
if [[ ! -f $path ]]; then
@ -38,7 +33,7 @@ main() {
exit 1
fi
CODE_SERVER_PATH="$path" CS_DISABLE_PLUGINS=true ./test/node_modules/.bin/jest "$@" --coverage=false --testRegex "./test/integration" --testPathIgnorePatterns "./test/integration/fixtures" --testPathIgnorePatterns "./test/integration/test-plugin"
CODE_SERVER_PATH="$path" CS_DISABLE_PLUGINS=true ./test/node_modules/.bin/jest "$@" --coverage=false --testRegex "./test/integration" --testPathIgnorePatterns "./test/integration/fixtures"
}
main "$@"

View File

@ -6,6 +6,13 @@ main() {
source ./ci/lib.sh
# TODO@jsjoeio - skip if already built
# TODO@jsjoeio - move to integration test suite too
echo "Building test plugin"
pushd test/unit/node/test-plugin
make -s out/index.js
popd
# Our code imports from `out` in order to work during development but if you
# have only built for production you will have not have this directory. In
# that case symlink `out` to a production build directory.

View File

@ -1,4 +1,5 @@
{
"extends": "../tsconfig.json",
"include": ["./**/*.ts"]
"include": ["./**/*.ts"],
"exclude": ["./unit/node/test-plugin"]
}

View File

@ -2,11 +2,11 @@ import { logger } from "@coder/logger"
import * as express from "express"
import * as fs from "fs"
import * as path from "path"
import { HttpCode } from "../../src/common/http"
import { AuthType } from "../../src/node/cli"
import { codeServer, PluginAPI } from "../../src/node/plugin"
import * as apps from "../../src/node/routes/apps"
import * as httpserver from "../utils/httpserver"
import { HttpCode } from "../../../src/common/http"
import { AuthType } from "../../../src/node/cli"
import { codeServer, PluginAPI } from "../../../src/node/plugin"
import * as apps from "../../../src/node/routes/apps"
import * as httpserver from "../../utils/httpserver"
const fsp = fs.promises
// Jest overrides `require` so our usual override doesn't work.

View File

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@ -1,24 +1,22 @@
import * as cs from "code-server"
import * as fspath from "path"
type FixMeLater = any
export const plugin: cs.Plugin = {
displayName: "Test Plugin",
routerPath: "/test-plugin",
homepageURL: "https://example.com",
description: "Plugin used in code-server tests.",
init(config: FixMeLater) {
init(config) {
config.logger.debug("test-plugin loaded!")
},
router() {
const r = cs.express.Router()
r.get("/test-app", (_: FixMeLater, res: FixMeLater) => {
r.get("/test-app", (_, res) => {
res.sendFile(fspath.resolve(__dirname, "../public/index.html"))
})
r.get("/goland/icon.svg", (_: FixMeLater, res: FixMeLater) => {
r.get("/goland/icon.svg", (_, res) => {
res.sendFile(fspath.resolve(__dirname, "../public/icon.svg"))
})
r.get("/error", () => {
@ -29,8 +27,8 @@ export const plugin: cs.Plugin = {
wsRouter() {
const wr = cs.WsRouter()
wr.ws("/test-app", (req: FixMeLater) => {
cs.wss.handleUpgrade(req, req.ws, req.head, (ws: FixMeLater) => {
wr.ws("/test-app", (req) => {
cs.wss.handleUpgrade(req, req.ws, req.head, (ws) => {
req.ws.resume()
ws.send("hello")
})