Merge pull request #4 from feedhenry/snyk-fix-cb7919cb

[Snyk Update] New fixes for 1 vulnerable dependency path
feedhenry · Oct 16, 2017 · 8baf214 · 8baf214
2 parents ce8bcc6 + 3bb9494
commit 8baf214
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 125 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,15 +1,15 @@
 {
   "name": "fh-gridfs",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "description": "Wrapper for file storage using gridfs for mongo databases.",
   "scripts": {
     "test": "grunt eslint fh-test",
     "version": "sed -i.bak \"s/sonar.projectVersion=.*/sonar.projectVersion=${npm_package_version}/\" sonar-project.properties && rm sonar-project.properties.bak && git add sonar-project.properties"
   },
   "main": "lib/gridFileManager.js",
-  "repository" : {
-    "type" : "git",
-     "url" : "git@github.com:feedhenry/fh-gridfs.git"
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:feedhenry/fh-gridfs.git"
   },
   "bugs": {
     "url": "https://github.com/feedhenry/fh-gridfs/issues"
@@ -24,7 +24,7 @@
     "base64-stream": "0.1.2",
     "gridfs-stream": "0.4.0",
     "lodash": "2.1.0",
-    "mime": "1.2.11",
+    "mime": "1.4.1",
     "mongodb": "2.1.18",
     "rimraf": "2.2.2",
     "usage": "^0.7.1"

diff --git a/test/testUsingFileStorage.js b/test/testUsingFileStorage.js
@@ -1020,7 +1020,7 @@ exports.testMigrateMultipleFiles = function(done){
           async.series([
             async.apply(checkFile, databaseDev, saveResults.file1.groupId, "test.zip", 1, "application/zip", undefined),
             async.apply(checkFile, databaseDev, saveResults.file2.groupId, "test.ppt", 1, "application/vnd.ms-powerpoint", undefined),
-            async.apply(checkFile, databaseDev, saveResults.file3.groupId, "test.xml", 1, "application/xml", undefined),
+            async.apply(checkFile, databaseDev, saveResults.file3.groupId, "test.xml", 1, "text/xml", undefined),
             async.apply(checkFile, databaseDev, saveResults.file4.groupId, "test.pdf", 1, "application/pdf", undefined),
             async.apply(checkFile, databaseDev, saveResults.file5.groupId, "test.docx", 1, "application/vnd.openxmlformats-officedocument.wordprocessingml.document", undefined),
             async.apply(checkFile, databaseDev, saveResults.file6.groupId, "test.html", 1, "text/html", undefined)
@@ -1030,7 +1030,7 @@ exports.testMigrateMultipleFiles = function(done){
             async.series([
               async.apply(checkFile, databaseLive, saveResults.file1.groupId, "test.zip", 1, "application/zip", undefined),
               async.apply(checkFile, databaseLive, saveResults.file2.groupId, "test.ppt", 1, "application/vnd.ms-powerpoint", undefined),
-              async.apply(checkFile, databaseLive, saveResults.file3.groupId, "test.xml", 1, "application/xml", undefined),
+              async.apply(checkFile, databaseLive, saveResults.file3.groupId, "test.xml", 1, "text/xml", undefined),
               async.apply(checkFile, databaseLive, saveResults.file4.groupId, "test.pdf", 1, "application/pdf", undefined),
               async.apply(checkFile, databaseLive, saveResults.file5.groupId, "test.docx", 1, "application/vnd.openxmlformats-officedocument.wordprocessingml.document", undefined),
               async.apply(checkFile, databaseLive, saveResults.file6.groupId, "test.html", 1, "text/html", undefined)
@@ -1177,7 +1177,7 @@ exports.testMigrateBothDirections = function(done){
 
                   assert.equal(historyResults.file2History[1].fileName, "test.xml");
                   assert.ok(historyResults.file2History[1].hash);
-                  assert.equal(historyResults.file2History[1].contentType, "application/xml");
+                  assert.equal(historyResults.file2History[1].contentType, "text/xml");
                   assert.equal(historyResults.file2History[1].version, 2);
 
                   assert.equal(historyResults.file2History[2].fileName, "test.mp4");