From 3754b8b91f30c4a4e1d20778be3dfd8abf412de8 Mon Sep 17 00:00:00 2001 From: Drew Gross Date: Tue, 10 May 2016 16:20:52 -0700 Subject: [PATCH 1/3] Update dependencies and support node 6.1 --- .travis.yml | 1 + package.json | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c79fd16cf..68052a1f5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: node_js node_js: - '4.3' +- '6.1' env: global: - COVERAGE_OPTION='./node_modules/babel-istanbul/lib/cli.js cover -x **/spec/**' diff --git a/package.json b/package.json index 503f8f66c6..2423cb0e04 100644 --- a/package.json +++ b/package.json @@ -57,10 +57,9 @@ "codecov": "^1.0.1", "cross-env": "^1.0.7", "deep-diff": "^0.3.3", - "flow-bin": "^0.22.0", - "gaze": "^0.5.2", + "gaze": "^1.0.0", "jasmine": "^2.3.2", - "mongodb-runner": "3.1.15", + "mongodb-runner": "3.2.2", "nodemon": "^1.8.1", "parse-server-gcs-adapter": "^1.0.0" }, From 17b9742d58bc52baba3869d7cb80e1ea48a07a13 Mon Sep 17 00:00:00 2001 From: Drew Gross Date: Tue, 10 May 2016 16:40:08 -0700 Subject: [PATCH 2/3] Remove gcs-adapter, which depends on grpc, which fails to build on node 6 --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 2423cb0e04..275de6cf02 100644 --- a/package.json +++ b/package.json @@ -60,8 +60,7 @@ "gaze": "^1.0.0", "jasmine": "^2.3.2", "mongodb-runner": "3.2.2", - "nodemon": "^1.8.1", - "parse-server-gcs-adapter": "^1.0.0" + "nodemon": "^1.8.1" }, "scripts": { "dev": "npm run build && node bin/dev", From d1c423fe11b974554c704f7744943e256d8cb6b8 Mon Sep 17 00:00:00 2001 From: Drew Gross Date: Tue, 10 May 2016 16:51:48 -0700 Subject: [PATCH 3/3] Remove GCS adapter usage --- spec/AdapterLoader.spec.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/spec/AdapterLoader.spec.js b/spec/AdapterLoader.spec.js index 81e057c51f..250a8a7c49 100644 --- a/spec/AdapterLoader.spec.js +++ b/spec/AdapterLoader.spec.js @@ -2,7 +2,6 @@ var loadAdapter = require("../src/Adapters/AdapterLoader").loadAdapter; var FilesAdapter = require("parse-server-fs-adapter").default; var S3Adapter = require("parse-server-s3-adapter").default; -var GCSAdapter = require("parse-server-gcs-adapter").default; var ParsePushAdapter = require("parse-server-push-adapter").default; describe("AdapterLoader", ()=>{ @@ -114,13 +113,4 @@ describe("AdapterLoader", ()=>{ }).not.toThrow(); done(); }) - - it("should load GCSAdapter from direct passing", (done) => { - var gcsAdapter = new GCSAdapter("projectId", "path/to/keyfile", "bucket") - expect(() => { - var adapter = loadAdapter(gcsAdapter, FilesAdapter); - expect(adapter).toBe(gcsAdapter); - }).not.toThrow(); - done(); - }) });