Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace request with node-fetch #450

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Replace request with node-fetch #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae43420
feat: create a request-like shim for tests
Zertz Oct 2, 2023
2fc59f0
Update yarn.lock
Zertz Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/node.js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
mongodb-version: ["4.4", "5.0", "6.0"]
node-version: [14.x, 16.x]
node-version: [14.x, 16.x, 18.x]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
"express": "^4.17.1",
"method-override": "^3.0.0",
"mocha": "^10.1.0",
"node-fetch": "^3.3.1",
"npm-run-all": "^4.1.5",
"prettier": "^2.7.1",
"request": "^2.88.2",
"restify": "^8.5.1",
"sinon": "^14.0.1",
"tsup": "^6.3.0",
Expand Down
20 changes: 7 additions & 13 deletions test/integration/access.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import assert from "assert";
import request from "request";
import { serve } from "../../dist/express-restify-mongoose.js";
import * as request from "../request.js";

import setupDb from "./setup.js";

Expand Down Expand Up @@ -471,9 +471,8 @@ export default function (createFn, setup, dismantle) {

updateMethods.forEach((method) => {
it(`${method} /Customer/:id - saves all fields`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
json: {
name: "John",
Expand Down Expand Up @@ -509,9 +508,8 @@ export default function (createFn, setup, dismantle) {
});

it(`${method} /Customer/:id - saves all fields (falsy values)`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
json: {
age: 0,
Expand Down Expand Up @@ -1045,9 +1043,8 @@ export default function (createFn, setup, dismantle) {

updateMethods.forEach((method) => {
it(`${method} /Customer/:id - saves protected and public fields`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
json: {
name: "John",
Expand Down Expand Up @@ -1093,9 +1090,8 @@ export default function (createFn, setup, dismantle) {
});

it(`${method} /Customer/:id - saves protected and public fields (falsy values)`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
json: {
age: 0,
Expand Down Expand Up @@ -1614,9 +1610,8 @@ export default function (createFn, setup, dismantle) {

updateMethods.forEach((method) => {
it(`${method} /Customer/:id - saves public fields`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
json: {
name: "John",
Expand Down Expand Up @@ -1662,9 +1657,8 @@ export default function (createFn, setup, dismantle) {
});

it(`${method} /Customer/:id - saves public fields (falsy values)`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
json: {
age: 0,
Expand Down
8 changes: 3 additions & 5 deletions test/integration/contextFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import assert from "assert";
import request from "request";
import { serve } from "../../dist/express-restify-mongoose.js";
import * as request from "../request.js";

import setupDb from "./setup.js";

Expand Down Expand Up @@ -134,9 +134,8 @@ export default function (createFn, setup, dismantle) {

updateMethods.forEach((method) => {
it(`${method} /Customer/:id 200`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customers[1]._id}`,
json: {
name: "Johnny",
Expand All @@ -152,9 +151,8 @@ export default function (createFn, setup, dismantle) {
});

it(`${method} /Customer/:id 404 - filtered name`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customers[0]._id}`,
json: {
name: "Bobby",
Expand Down
4 changes: 3 additions & 1 deletion test/integration/create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import assert from "assert";
import mongoose from "mongoose";
import request from "request";
import { serve } from "../../dist/express-restify-mongoose.js";
import * as request from "../request.js";

import setupDb from "./setup.js";

Expand All @@ -19,7 +19,9 @@ export default function (createFn, setup, dismantle) {
let customer, product;

before((done) => {
console.info("before");
setup((err) => {
console.info("setup");
if (err) {
return done(err);
}
Expand Down
2 changes: 1 addition & 1 deletion test/integration/delete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import assert from "assert";
import mongoose from "mongoose";
import request from "request";
import { serve } from "../../dist/express-restify-mongoose.js";
import * as request from "../request.js";

import setupDb from "./setup.js";

Expand Down
2 changes: 1 addition & 1 deletion test/integration/hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import assert from "assert";
import request from "request";
import { serve } from "../../dist/express-restify-mongoose.js";
import * as request from "../request.js";

import setupDb from "./setup.js";

Expand Down
38 changes: 13 additions & 25 deletions test/integration/middleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import assert from "assert";
import mongoose from "mongoose";
import request from "request";
import sinon from "sinon";
import { serve } from "../../dist/express-restify-mongoose.js";
import * as request from "../request.js";

import setupDb from "./setup.js";

Expand Down Expand Up @@ -87,9 +87,8 @@ export default function (createFn, setup, dismantle) {

updateMethods.forEach((method) => {
it(`${method} /Customer/:id 200`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
json: {
name: "Bobby",
Expand Down Expand Up @@ -262,9 +261,8 @@ export default function (createFn, setup, dismantle) {

updateMethods.forEach((method) => {
it(`${method} /Customer/:id 200`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
json: {
name: "Bobby",
Expand All @@ -283,9 +281,8 @@ export default function (createFn, setup, dismantle) {
});

it(`${method} /Customer/:id 400 - not called (missing content type)`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
},
(err, res, body) => {
Expand All @@ -302,9 +299,8 @@ export default function (createFn, setup, dismantle) {
});

it(`${method} /Customer/:id 400 - not called (invalid content type)`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
formData: {},
},
Expand Down Expand Up @@ -591,9 +587,8 @@ export default function (createFn, setup, dismantle) {

updateMethods.forEach((method) => {
it(`${method} /Customer/:id 200`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
json: {
name: "Bobby",
Expand All @@ -614,9 +609,8 @@ export default function (createFn, setup, dismantle) {
});

it(`${method} /Customer/:id 400 - not called (missing content type)`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
},
(err, res, body) => {
Expand All @@ -633,9 +627,8 @@ export default function (createFn, setup, dismantle) {
});

it(`${method} /Customer/:id 400 - not called (invalid content type)`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
formData: {},
},
Expand Down Expand Up @@ -1144,9 +1137,8 @@ export default function (createFn, setup, dismantle) {

updateMethods.forEach((method) => {
it(`${method} /Customer/:id 200`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
json: {
name: "Bobby",
Expand All @@ -1167,9 +1159,8 @@ export default function (createFn, setup, dismantle) {
});

it(`${method} /Customer/:id 404 - random id`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${randomId}`,
json: {
name: "Bobby",
Expand All @@ -1185,9 +1176,8 @@ export default function (createFn, setup, dismantle) {
});

it(`${method} /Customer/:id 404 - invalid id`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${invalidId}`,
json: {
name: "Bobby",
Expand All @@ -1203,9 +1193,8 @@ export default function (createFn, setup, dismantle) {
});

it(`${method} /Customer/:id 400 - not called (missing content type)`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
},
(err, res, body) => {
Expand All @@ -1222,9 +1211,8 @@ export default function (createFn, setup, dismantle) {
});

it(`${method} /Customer/:id 400 - not called (invalid content type)`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
formData: {},
},
Expand Down
8 changes: 3 additions & 5 deletions test/integration/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import assert from "assert";
import request from "request";
import sinon from "sinon";
import { serve } from "../../dist/express-restify-mongoose.js";
import * as request from "../request.js";

import setupDb from "./setup.js";

Expand Down Expand Up @@ -715,9 +715,8 @@ export default function (createFn, setup, dismantle) {

updateMethods.forEach((method) => {
it(`${method} /Customer/:id 200`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer._id}`,
json: {
age: 12,
Expand Down Expand Up @@ -855,9 +854,8 @@ export default function (createFn, setup, dismantle) {

updateMethods.forEach((method) => {
it(`${method} /Customer/:name 200`, (done) => {
request(
request[method](
{
method,
url: `${testUrl}/api/v1/Customer/${customer.name}`,
json: {
age: 12,
Expand Down
2 changes: 1 addition & 1 deletion test/integration/read.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import assert from "assert";
import mongoose from "mongoose";
import request from "request";
import { serve } from "../../dist/express-restify-mongoose.js";
import * as request from "../request.js";

import setupDb from "./setup.js";

Expand Down
14 changes: 10 additions & 4 deletions test/integration/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,16 @@ export default function () {
}

if (opts.connect) {
const uri = process.env.MONGO_URL || "mongodb://localhost/database";
mongoose.connect(uri).then(function () {
callback();
});
const uri = process.env.MONGO_URL || "mongodb://localhost:27017/database";
console.info("opts", opts, uri);
mongoose
.connect(uri)
.then(() => {
callback();
})
.catch((e) => {
callback(e);
});
} else if (typeof callback === "function") {
callback();
}
Expand Down
Loading
Loading