Merge af811df into 83a5bc4

maidsafe-archive · Jan 30, 2019 · 1abd1d8 · 1abd1d8
2 parents 83a5bc4 + af811df
commit 1abd1d8
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ os:
 - osx
 language: node_js
 node_js:
-- '8.0.0'
+- '10.0.0'
 
 addons:
   apt:

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -10,6 +10,7 @@
 ### Changed
 - All RDF methods which take RDF `subject`, `predicate`, `object` arguments now also take a fourth `provenance` argument, to be consistent with rdflib.js
 - Documentation enhanced with improved JSDoc annotation and template
+- Upgrade Node-FFI to v2.3.0
 
 ### Added
 - Code examples for experimental API operations: RDF, WebId, WebInterface

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ The documentation for the latest `safe_app_nodejs` API is available at <http://d
 
 1. Prerequisites
 
-    * [Node.js](https://nodejs.org) ^8.0.0 (we recommend installing it via [nvm](https://github.com/creationix/nvm))
+    * [Node.js](https://nodejs.org) ^10.0.0 (we recommend installing it via [nvm](https://github.com/creationix/nvm))
     * [Git](https://git-scm.com/)
     * [Yarn](https://yarnpkg.com) (as a replacement for `npm`).
     * Windows-specific:

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 environment:
-  nodejs_version: "8.0.0"
+  nodejs_version: "10.0.0"
 
 platform:
   - x64

diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "cross-env": "5.1.3",
     "deps_downloader": "https://s3.eu-west-2.amazonaws.com/deps-downloader/deps_downloader-0.3.0.tgz",
     "enum": "^2.3.0",
-    "ffi": "^2.2.0",
+    "ffi": "^2.3.0",
     "mime": "^2.0.3",
     "multihashes": "^0.4.14",
     "rdflib": "^0.19.1",

diff --git a/test/app.js b/test/app.js
@@ -97,7 +97,7 @@ describe('Smoke test', () => {
       null,
       null,
       optionsObject
-    )).be.rejectedWith(errConst.CONFIG_PATH_ERROR.msg('TypeError: error setting argument 0 - "string" must be a string, Buffer, or ArrayBuffer'));
+    )).be.rejectedWith(/string, Buffer, or ArrayBuffer/);
   });
 
   it('throw error if options object contains non-boolean forceUseMock value', () => {

diff --git a/test/crypto.js b/test/crypto.js
@@ -215,7 +215,7 @@ describe('Encryption keys', () => {
       return myHandleOnTheirPubKey.encryptSealed(plaintext)
         .then((cipher) => {
           should(cipher.toString()).not.equal(plaintext);
-          return should(theirKeys.decryptSealed()).be.rejectedWith('First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.');
+          return should(theirKeys.decryptSealed()).be.rejectedWith(/string, Buffer, ArrayBuffer, Array/);
         });
     });
 

diff --git a/test/nfs.js b/test/nfs.js
@@ -246,7 +246,7 @@ describe('NFS emulation', () => {
     file = await nfs.insert('hello.txt', file, userMetadata);
     const fileVersion = file.version;
     const test = () => nfs.update('hello.txt', file, fileVersion + 1, { meta: 'data' });
-    return should(test).throw('First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.');
+    return should(test).throw(/string, Buffer, ArrayBuffer, Array/);
   });
 
   it('throws error if invalid user metadata type is passed while inserting file', async () => {
@@ -255,6 +255,6 @@ describe('NFS emulation', () => {
     const nfs = mData.emulateAs('nfs');
     const file = nfs.create('hello, SAFE world!');
     const test = () => nfs.insert('hello.txt', file, 5);
-    return should(test).throw('"value" argument must not be a number');
+    return should(test).throw(/"value" argument must not be/);
   });
 });
diff --git a/yarn.lock b/yarn.lock
@@ -309,6 +309,7 @@ bindings@1, bindings@^1.2.1:
 bindings@~1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11"
+  integrity sha1-FK1hE4EtLTfXLme0ystLtyZQXxE=
 
 bluebird@~3.5.0:
   version "3.5.3"
@@ -890,9 +891,10 @@ fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
-ffi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ffi/-/ffi-2.2.0.tgz#bf18b04666a29f71227ed56895d5430af47042fa"
+ffi@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/ffi/-/ffi-2.3.0.tgz#fa1a7b3d85c0fa8c83d96947a64b5192bc47f858"
+  integrity sha512-vkPA9Hf9CVuQ5HeMZykYvrZF2QNJ/iKGLkyDkisBnoOOFeFXZQhUPxBARPBIZMJVulvBI2R+jgofW03gyPpJcQ==
   dependencies:
     bindings "~1.2.0"
     debug "2"