@tryghost/express-test 0.13.17 → 0.14.1

package/lib/Request.js

@@ -1,7 +1,7 @@
 const {default: reqresnext} = require('reqresnext');
 const {CookieAccessInfo} = require('cookiejar');
 const {parse} = require('url');
-const {isJSON} = require('./utils');
+const {isJSON, attachFile} = require('./utils');
 const {Readable} = require('stream');
 
 class RequestOptions {
@@ -22,6 +22,15 @@ class Request {
         this.app = app;
         this.reqOptions = reqOptions instanceof RequestOptions ? reqOptions : new RequestOptions(reqOptions);
         this.cookieJar = cookieJar;
+        this._formData = null; // Track FormData instance for multiple attachments
+    }
+
+    attach(name, filePath) {
+        // Use the utility to create or append to FormData
+        this._formData = attachFile(name, filePath, this._formData);
+
+        // Set the body to the FormData instance
+        return this.body(this._formData);
     }
 
     /**
@@ -86,7 +95,7 @@ class Request {
                 readableStream.pause();
             },
             read: () => {
-                readableStream.read(...arguments);
+                return readableStream.read(...arguments);
             }
         };
         return this;

package/lib/utils.js

@@ -1,7 +1,12 @@
-module.exports.isJSON = function isJSON(mime) {
+const fs = require('fs');
+const path = require('path');
+const mime = require('mime-types');
+const FormData = require('form-data');
+
+module.exports.isJSON = function isJSON(mimeType) {
     // should match /json or +json
     // but not /json-seq
-    return /[/+]json($|[^-\w])/i.test(mime);
+    return /[/+]json($|[^-\w])/i.test(mimeType);
 };
 
 module.exports.normalizeURL = function normalizeURL(toNormalize) {
@@ -15,3 +20,17 @@ module.exports.normalizeURL = function normalizeURL(toNormalize) {
 
     return normalized;
 };
+
+module.exports.attachFile = function attachFile(name, filePath, existingFormData = null) {
+    const formData = existingFormData || new FormData();
+    const fileContent = fs.readFileSync(filePath);
+    const filename = path.basename(filePath);
+    const contentType = mime.lookup(filePath) || 'application/octet-stream';
+
+    formData.append(name, fileContent, {
+        filename,
+        contentType
+    });
+
+    return formData;
+};

package/package.json

@@ -1,7 +1,11 @@
 {
   "name": "@tryghost/express-test",
-  "version": "0.13.17",
-  "repository": "https://github.com/TryGhost/framework/tree/main/packages/express-test",
+  "version": "0.14.1",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/TryGhost/framework.git",
+    "directory": "packages/express-test"
+  },
   "author": "Ghost Foundation",
   "license": "MIT",
   "main": "index.js",
@@ -22,15 +26,16 @@
     "c8": "10.1.3",
     "express": "4.21.1",
     "express-session": "1.18.1",
-    "form-data": "^4.0.0",
     "mocha": "10.7.3",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^2.0.0",
     "sinon": "18.0.0"
   },
   "dependencies": {
-    "@tryghost/jest-snapshot": "^0.5.17",
+    "@tryghost/jest-snapshot": "^0.5.18",
     "cookiejar": "^2.1.3",
+    "form-data": "^4.0.2",
+    "mime-types": "^3.0.1",
     "reqresnext": "^1.7.0"
   },
-  "gitHead": "b169bd1734b749c3abdaac134f030756b9a282bb"
+  "gitHead": "5c1f8f8e850900331ba28e6816efb1d347d3c68c"
 }