undo double quote behavior from prettier in example and reduce verbosity of action url

dev
quilty 6 years ago
parent e5b77f10e9
commit 29dcc98dc7
  1. 25
      example/server.js
  2. 46
      test/tempFile.spec.js

@ -1,40 +1,41 @@
const express = require("express"); const express = require('express');
const fileUpload = require("express-fileupload"); const fileUpload = require('express-fileupload');
const app = express(); const app = express();
app.use("/form", express.static(__dirname + "/index.html")); const PORT = 8000;
app.use('/form', express.static(__dirname + '/index.html'));
// default options // default options
app.use(fileUpload()); app.use(fileUpload());
app.get("/ping", function(req, res) { app.get('/ping', function(req, res) {
res.send("pong"); res.send('pong');
}); });
app.post("/upload", function(req, res) { app.post('/upload', function(req, res) {
let sampleFile; let sampleFile;
let uploadPath; let uploadPath;
if (Object.keys(req.files).length == 0) { if (Object.keys(req.files).length == 0) {
res.status(400).send("No files were uploaded."); res.status(400).send('No files were uploaded.');
return; return;
} }
console.log("req.files >>>", req.files); // eslint-disable-line console.log('req.files >>>', req.files); // eslint-disable-line
sampleFile = req.files.sampleFile; sampleFile = req.files.sampleFile;
uploadPath = __dirname + "/uploads/" + sampleFile.name; uploadPath = __dirname + '/uploads/' + sampleFile.name;
sampleFile.mv(uploadPath, function(err) { sampleFile.mv(uploadPath, function(err) {
if (err) { if (err) {
return res.status(500).send(err); return res.status(500).send(err);
} }
res.send("File uploaded to " + uploadPath); res.send('File uploaded to ' + uploadPath);
}); });
}); });
app.listen(8002, function() { app.listen(PORT, function() {
console.log("Express server listening on port 8002"); // eslint-disable-line console.log('Express server listening on port ', PORT); // eslint-disable-line
}); });

@ -1,11 +1,11 @@
const fs = require("fs"); const fs = require('fs');
const path = require("path"); const path = require('path');
const request = require("supertest"); const request = require('supertest');
const server = require("./server"); const server = require('./server');
const clearUploadsDir = server.clearUploadsDir; const clearUploadsDir = server.clearUploadsDir;
const fileDir = server.fileDir; const fileDir = server.fileDir;
const uploadDir = server.uploadDir; const uploadDir = server.uploadDir;
describe("File Upload Options Tests", function() { describe('File Upload Options Tests', function() {
afterEach(function(done) { afterEach(function(done) {
clearUploadsDir(); clearUploadsDir();
done(); done();
@ -24,8 +24,8 @@ describe("File Upload Options Tests", function() {
done done
) { ) {
request(server.setup(options)) request(server.setup(options))
.post("/upload/single") .post('/upload/single')
.attach("testFile", path.join(fileDir, actualFileNameToUpload)) .attach('testFile', path.join(fileDir, actualFileNameToUpload))
.expect(200) .expect(200)
.end(function(err) { .end(function(err) {
if (err) { if (err) {
@ -38,15 +38,15 @@ describe("File Upload Options Tests", function() {
fs.stat(uploadedFilePath, done); fs.stat(uploadedFilePath, done);
}); });
} }
describe("Testing [safeFileNames with useTempFiles] option to ensure:", function() { describe('Testing [safeFileNames with useTempFiles] option to ensure:', function() {
it("Does nothing to your filename when disabled.", function(done) { it('Does nothing to your filename when disabled.', function(done) {
const fileUploadOptions = { const fileUploadOptions = {
safeFileNames: false, safeFileNames: false,
useTempFiles: true, useTempFiles: true,
tempFileDir: "/tmp/" tempFileDir: '/tmp/'
}; };
const actualFileName = "my$Invalid#fileName.png123"; const actualFileName = 'my$Invalid#fileName.png123';
const expectedFileName = "my$Invalid#fileName.png123"; const expectedFileName = 'my$Invalid#fileName.png123';
executeFileUploadTestWalk( executeFileUploadTestWalk(
fileUploadOptions, fileUploadOptions,
actualFileName, actualFileName,
@ -54,10 +54,10 @@ describe("File Upload Options Tests", function() {
done done
); );
}); });
it("Is disabled by default.", function(done) { it('Is disabled by default.', function(done) {
const fileUploadOptions = { useTempFiles: true, tempFileDir: "/tmp/" }; const fileUploadOptions = { useTempFiles: true, tempFileDir: '/tmp/' };
const actualFileName = "my$Invalid#fileName.png123"; const actualFileName = 'my$Invalid#fileName.png123';
const expectedFileName = "my$Invalid#fileName.png123"; const expectedFileName = 'my$Invalid#fileName.png123';
executeFileUploadTestWalk( executeFileUploadTestWalk(
fileUploadOptions, fileUploadOptions,
actualFileName, actualFileName,
@ -65,14 +65,14 @@ describe("File Upload Options Tests", function() {
done done
); );
}); });
it("Strips away all non-alphanumeric characters (excluding hyphens/underscores) when enabled.", function(done) { it('Strips away all non-alphanumeric characters (excluding hyphens/underscores) when enabled.', function(done) {
const fileUploadOptions = { const fileUploadOptions = {
safeFileNames: true, safeFileNames: true,
useTempFiles: true, useTempFiles: true,
tempFileDir: "/tmp/" tempFileDir: '/tmp/'
}; };
const actualFileName = "my$Invalid#fileName.png123"; const actualFileName = 'my$Invalid#fileName.png123';
const expectedFileName = "myInvalidfileNamepng123"; const expectedFileName = 'myInvalidfileNamepng123';
executeFileUploadTestWalk( executeFileUploadTestWalk(
fileUploadOptions, fileUploadOptions,
actualFileName, actualFileName,
@ -84,10 +84,10 @@ describe("File Upload Options Tests", function() {
const fileUploadOptions = { const fileUploadOptions = {
safeFileNames: /[\$#]/g, safeFileNames: /[\$#]/g,
useTempFiles: true, useTempFiles: true,
tempFileDir: "/tmp/" tempFileDir: '/tmp/'
}; };
const actualFileName = "my$Invalid#fileName.png123"; const actualFileName = 'my$Invalid#fileName.png123';
const expectedFileName = "myInvalidfileName.png123"; const expectedFileName = 'myInvalidfileName.png123';
executeFileUploadTestWalk( executeFileUploadTestWalk(
fileUploadOptions, fileUploadOptions,
actualFileName, actualFileName,

Loading…
Cancel
Save